v3.1 release

2piradians · Aug 19, 2017 · 981051c · 981051c
1 parent f52a096
commit 981051c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/src/main/java/twopiradians/minewatch/common/item/ModItems.java b/src/main/java/twopiradians/minewatch/common/item/ModItems.java
@@ -42,7 +42,7 @@ public static void preInit () {
 		}
 
 		genji_shuriken_single = registerItem(new ItemGenjiShuriken(), "genji_shuriken_single", false, true);
-
+		((ItemGenjiShuriken)genji_shuriken_single).hero = EnumHero.GENJI;
 	}
 
 	private static Item registerItem(Item item, String unlocalizedName, boolean addToTab, boolean usesObjModel) {

diff --git a/src/main/java/twopiradians/minewatch/common/potion/PotionFrozen.java b/src/main/java/twopiradians/minewatch/common/potion/PotionFrozen.java
@@ -122,6 +122,10 @@ public void colorEntities(RenderLivingEvent.Pre<EntityLivingBase> event) {
 	@SubscribeEvent
 	public void clientSide(PlayerTickEvent event) {
 		if (event.phase == TickEvent.Phase.END && event.side == Side.CLIENT) {
+			if (event.player.getActivePotionEffect(ModPotions.frozen) != null &&
+					event.player.getActivePotionEffect(ModPotions.frozen).getDuration() == 0)
+				event.player.removeActivePotionEffect(ModPotions.frozen);
+
 			if (event.player.ticksExisted % 2 == 0) {
 				ArrayList<EntityLivingBase> toRemove = new ArrayList<EntityLivingBase>();
 				for (EntityLivingBase entity : clientFreezes.keySet())

diff --git a/src/main/resources/assets/minewatch/models/item/reaper_weapon.obj b/src/main/resources/assets/minewatch/models/item/reaper_weapon.obj
@@ -14698,4 +14698,3 @@ f 3490/3346/2872 3491/3348/2874 3492/2564/2237 3493/2563/2236
 f 4059/1783/1540 4061/2824/3 4064/1784/1541
 f 2344/1766/1524 2340/2224/1957 2341/2812/2443
 f 3236/1318/550 3243/1317/549 3217/3946/2503 3231/3556/2633
-l 21 22
diff --git a/src/main/resources/assets/minewatch/models/item/soldier76_weapon.obj b/src/main/resources/assets/minewatch/models/item/soldier76_weapon.obj
@@ -23810,9 +23810,3 @@ f 2212/1547/772 2210/1549/774 2211/1496/724 2213/1537/762
 f 3191/5961/511 3189/7246/511 3190/7247/511 3192/5962/511
 f 6932/5070/3236 6933/7204/3561 6930/6366/4253 6927/2975/1852
 f 5686/4863/3126 5685/5106/3255 5682/4055/2664 5680/4864/3127
-l 535 534
-l 565 564
-l 735 734
-l 765 764
-l 954 955
-l 984 985
diff --git a/src/main/resources/assets/minewatch/models/item/tracer_weapon.obj b/src/main/resources/assets/minewatch/models/item/tracer_weapon.obj
@@ -4798,4 +4798,3 @@ f 213/708/531 199/711/534 198/1131/854 212/1130/853
 f 20/637/874 19/636/843 623/1112/843 621/1155/874
 f 180/1038/503 194/732/503 195/833/502 181/1187/502
 f 66/94/998 64/135/777 650/584/777 652/443/998
-l 126 127
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ public static void preInit () { @@
     		}
     		genji_shuriken_single = registerItem(new ItemGenjiShuriken(), "genji_shuriken_single", false, true);
+    		((ItemGenjiShuriken)genji_shuriken_single).hero = EnumHero.GENJI;
     	}
     	private static Item registerItem(Item item, String unlocalizedName, boolean addToTab, boolean usesObjModel) {
@@ Expand Down @@