diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
index dadfce6e6e..ed57a7e2a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
@@ -50,7 +50,7 @@ public class CraftInventoryView extends InventoryView {
     @Override
     public void setItem(int slot, ItemStack item) {
         net.minecraft.server.ItemStack stack = CraftItemStack.asNMSCopy(item);
-        if (slot != -999) {
+        if (slot >= 0) {
             container.getSlot(slot).set(stack);
         } else {
             player.getHandle().drop(stack, false);
@@ -59,7 +59,7 @@ public class CraftInventoryView extends InventoryView {
 
     @Override
     public ItemStack getItem(int slot) {
-        if (slot == -999) {
+        if (slot < 0) {
             return null;
         }
         return CraftItemStack.asCraftMirror(container.getSlot(slot).getItem());
@@ -125,7 +125,7 @@ public class CraftInventoryView extends InventoryView {
                 // Nothing to do, it's a CONTAINER slot
             }
         } else {
-            if (slot == -999 || slot == -1) {
+            if (slot < 0) {
                 type = SlotType.OUTSIDE;
             } else if (inventory.getType() == InventoryType.CRAFTING) { // Also includes creative inventory
                 if (slot < 9) {