소스 검색

Added null checks to BlockBreak & BlockDamage events to help with mod
compatibility.

GJ 13 년 전
부모
커밋
946b5bb006
1개의 변경된 파일14개의 추가작업 그리고 4개의 파일을 삭제
  1. 14 4
      src/main/java/com/gmail/nossr50/listeners/BlockListener.java

+ 14 - 4
src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -153,18 +153,23 @@ public class BlockListener implements Listener {
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockBreak(BlockBreakEvent event) {
+        if (event instanceof FakeBlockBreakEvent) {
+            return;
+        }
+
         Player player = event.getPlayer();
         PlayerProfile PP = Users.getProfile(player);
+
+        if (PP == null) {
+            return;
+        }
+
         Block block = event.getBlock();
         ItemStack inHand = player.getItemInHand();
 
         Config configInstance = Config.getInstance();
         Permissions permInstance = Permissions.getInstance();
 
-        if (event instanceof FakeBlockBreakEvent) {
-            return;
-        }
-
         /* HERBALISM */
         if (BlockChecks.canBeGreenTerra(block)) {
             /* Green Terra */
@@ -264,6 +269,11 @@ public class BlockListener implements Listener {
 
         Player player = event.getPlayer();
         PlayerProfile PP = Users.getProfile(player);
+
+        if (PP == null) {
+            return;
+        }
+
         ItemStack inHand = player.getItemInHand();
         Block block = event.getBlock();
         Material material = block.getType();