Now works on SSP

DoubleDoorDevelopment · Feb 8, 2016 · e6383bf · e6383bf
1 parent 69e4e24
commit e6383bf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.0.0"
+version = "1.1.0"
 if (System.getenv().BUILD_NUMBER != null) version += "." + System.getenv().BUILD_NUMBER
 
 targetCompatibility = 1.7

diff --git a/src/main/java/net/doubledoordev/itemblacklist/Helper.java b/src/main/java/net/doubledoordev/itemblacklist/Helper.java
@@ -5,6 +5,7 @@
 import net.doubledoordev.itemblacklist.data.BanList;
 import net.doubledoordev.itemblacklist.data.BanListEntry;
 import net.doubledoordev.itemblacklist.data.GlobalBanList;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.server.MinecraftServer;
 
 import java.io.File;
@@ -58,4 +59,9 @@ public static int[] parseDimIds(String dimension)
         }
         throw new IllegalArgumentException(dimension + " isn't a valid dimension range.");
     }
+
+    public static boolean shouldCare(EntityPlayer player)
+    {
+        return MinecraftServer.getServer().isSinglePlayer() || !MinecraftServer.getServer().getConfigurationManager().func_152596_g(player.getGameProfile());
+    }
 }
diff --git a/src/main/java/net/doubledoordev/itemblacklist/util/ServerEventHandlers.java b/src/main/java/net/doubledoordev/itemblacklist/util/ServerEventHandlers.java
@@ -8,7 +8,6 @@
 import net.doubledoordev.itemblacklist.data.GlobalBanList;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.ChatComponentText;
 import net.minecraftforge.event.entity.item.ItemTossEvent;
 import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
@@ -33,7 +32,7 @@ public void blockPlaceEvent(BlockEvent.PlaceEvent event)
     {
         EntityPlayer player = event.player;
         if (player == null || event.itemInHand == null) return;
-        if (MinecraftServer.getServer().getConfigurationManager().func_152596_g(player.getGameProfile())) return;
+        if (!Helper.shouldCare(event.player)) return;
         if (GlobalBanList.isBanned(player.dimension, player.getHeldItem()))
         {
             player.addChatComponentMessage(new ChatComponentText(ItemBlacklist.message));
@@ -55,7 +54,7 @@ public void playerInteractEvent(PlayerInteractEvent event)
     {
         if (event.entityPlayer.getHeldItem() == null) return;
         EntityPlayer player = event.entityPlayer;
-        if (MinecraftServer.getServer().getConfigurationManager().func_152596_g(player.getGameProfile())) return;
+        if (!Helper.shouldCare(player)) return;
         if (GlobalBanList.isBanned(player.dimension, player.getHeldItem()))
         {
             player.addChatComponentMessage(new ChatComponentText(ItemBlacklist.message));
@@ -68,29 +67,29 @@ public void playerInteractEvent(PlayerInteractEvent event)
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void changeDimension(PlayerEvent.PlayerChangedDimensionEvent event)
     {
-        if (MinecraftServer.getServer().getConfigurationManager().func_152596_g(event.player.getGameProfile())) return;
+        if (!Helper.shouldCare(event.player)) return;
         GlobalBanList.process(event.toDim, event.player.inventory);
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void itemTossEvent(ItemTossEvent event)
     {
-        if (MinecraftServer.getServer().getConfigurationManager().func_152596_g(event.player.getGameProfile())) return;
+        if (!Helper.shouldCare(event.player)) return;
         event.entityItem.setEntityItemStack(GlobalBanList.process(event.player.dimension, event.entityItem.getEntityItem()));
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void entityItemPickupEvent(EntityItemPickupEvent event)
     {
-        if (MinecraftServer.getServer().getConfigurationManager().func_152596_g(event.entityPlayer.getGameProfile())) return;
+        if (!Helper.shouldCare(event.entityPlayer)) return;
         event.item.setEntityItemStack(GlobalBanList.process(event.entityPlayer.dimension, event.item.getEntityItem()));
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void playerOpenContainerEvent(PlayerOpenContainerEvent event)
     {
         EntityPlayer player = event.entityPlayer;
-        if (MinecraftServer.getServer().getConfigurationManager().func_152596_g(player.getGameProfile())) return;
+        if (!Helper.shouldCare(event.entityPlayer)) return;
         if (player.getEntityData().getInteger(Helper.MODID) != player.openContainer.hashCode()) // Crude is inventory changed
         {
             player.getEntityData().setInteger(Helper.MODID, player.openContainer.hashCode());