From a582b075491d60ce731715c5b8fbc95618c8f844 Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Tue, 13 Nov 2012 22:14:26 +0100
Subject: [PATCH] Small error fix - As mentioned by Glitchfinder

---
 .gitignore                                            | 5 ++++-
 src/main/java/com/gmail/nossr50/util/BlockChecks.java | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9ceb119ca..3fa62546b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,7 @@
 *.jar
 
 # Atlassian Stuff
-/atlassian-ide-plugin.xml
\ No newline at end of file
+/atlassian-ide-plugin.xml
+src/.DS_Store
+
+src/main/.DS_Store
diff --git a/src/main/java/com/gmail/nossr50/util/BlockChecks.java b/src/main/java/com/gmail/nossr50/util/BlockChecks.java
index 18c6c35eb..f109378fa 100644
--- a/src/main/java/com/gmail/nossr50/util/BlockChecks.java
+++ b/src/main/java/com/gmail/nossr50/util/BlockChecks.java
@@ -105,7 +105,7 @@ public class BlockChecks {
             return false;
 
         default:
-            if (block.getTypeId() == Config.getInstance().getRepairAnvilId() | block.getTypeId() == Config.getInstance().getSalvageAnvilId()) {
+            if (block.getTypeId() == Config.getInstance().getRepairAnvilId() || block.getTypeId() == Config.getInstance().getSalvageAnvilId()) {
                 return false;
             }
             else {