JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed hammer throw

Browse Source
This commit is contained in:
Mysticate 2015-10-15 23:02:51 -04:00
parent f0e0d41c42
commit f0a22d5c36
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHammerThrow.java
View File

@ -110,9 +110,11 @@ public class PerkHammerThrow extends Perk implements IThrown
{ {
Item item = itemIterator.next(); Item item = itemIterator.next();
if (item.getTicksLived() > 200 || !item.isValid()) if (item == null || item.getTicksLived() > 200 || !item.isValid() || item.isDead())
{ {
item.remove(); if (item != null)
item.remove();
itemIterator.remove(); itemIterator.remove();
Player player = _thrown.get(item); Player player = _thrown.get(item);
@ -120,9 +122,6 @@ public class PerkHammerThrow extends Perk implements IThrown
if (!Manager.IsAlive(player)) if (!Manager.IsAlive(player))
continue; continue;
if (UtilPlayer.isSpectator(player))
continue;
_thrown.get(item).getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.DIAMOND_AXE, (byte)0, 1, F.item("Thor Hammer"))); _thrown.get(item).getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.DIAMOND_AXE, (byte)0, 1, F.item("Thor Hammer")));
} }
} }