v3.2

2piradians · Sep 3, 2017 · 9548239 · 9548239
1 parent 968ec3a
commit 9548239
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/libs/jei_1.12.1-4.7.5.88.jar b/libs/jei_1.12.1-4.7.5.88.jar
diff --git a/src/main/java/twopiradians/minewatch/common/item/weapon/ItemReaperShotgun.java b/src/main/java/twopiradians/minewatch/common/item/weapon/ItemReaperShotgun.java
@@ -212,7 +212,7 @@ public void serverSide(WorldTickEvent event) {
 		if (event.phase == TickEvent.Phase.END && event.world.getTotalWorldTime() % 3 == 0) {
 			ArrayList<EntityPlayer> toRemove = new ArrayList<EntityPlayer>();
 			for (EntityPlayer player : serverTps.keySet()) {
-				if (serverTps.get(player).getFirst() > 1) {
+				if (serverTps.get(player).getFirst() > 1 && player.getHealth() > 0) {
 					serverTps.put(player, new Tuple(serverTps.get(player).getFirst()-1, serverTps.get(player).getSecond()));
 
 					if (serverTps.get(player).getFirst() == 40) {