Prevent corrupt projectile entities to enter the world

SlimeKnights · May 10, 2015 · 44cede5 · 44cede5
1 parent 455b92e
commit 44cede5
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/main/java/tconstruct/weaponry/WeaponryHandler.java b/src/main/java/tconstruct/weaponry/WeaponryHandler.java
@@ -8,8 +8,10 @@
 import net.minecraft.nbt.NBTTagString;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
+import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import tconstruct.armor.player.TPlayerStats;
 import tconstruct.library.crafting.PatternBuilder;
+import tconstruct.library.entity.ProjectileBase;
 import tconstruct.library.event.PartBuilderEvent;
 import tconstruct.library.event.SmelteryCastEvent;
 import tconstruct.library.util.IToolPart;
@@ -415,4 +417,15 @@ public void boneanaBuilding(ToolCraftEvent.NormalTool event) {
             event.setResult(Event.Result.ALLOW);
         }
     }
+
+    @SubscribeEvent
+    public void entityJoin(EntityJoinWorldEvent event) {
+        // This prevents invalid projectiles to be created
+        // This can happen because of ID remaps.
+        if(event.entity instanceof ProjectileBase) {
+            ProjectileBase projectile = (ProjectileBase) event.entity;
+            if(projectile.returnStack == null || !(projectile.returnStack.getItem() instanceof ToolCore))
+                event.setCanceled(true);
+        }
+    }
 }