feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Fixed bow kills not being traceable

Browse Source
This commit is contained in:
Thundaklap
2015-03-08 16:48:54 +00:00
committed by Philip Cass
parent f9052e0afc
commit 6b4be88181
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/diddiz/LogBlock/Consumer.java
View File

@@ -8,6 +8,7 @@ import org.bukkit.block.BlockState;
import org.bukkit.block.Sign; import org.bukkit.block.Sign;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@@ -168,8 +169,13 @@ public class Consumer extends TimerTask
if (killer == null || victim == null) if (killer == null || victim == null)
return; return;
int weapon = 0; int weapon = 0;
if(killer instanceof Projectile)
killer = ((Projectile)killer).getShooter();
if (killer instanceof Player && ((Player)killer).getItemInHand() != null) if (killer instanceof Player && ((Player)killer).getItemInHand() != null)
weapon = ((Player)killer).getItemInHand().getTypeId(); weapon = ((Player)killer).getItemInHand().getTypeId();
queueKill(victim.getLocation(), entityName(killer), entityName(victim), weapon); queueKill(victim.getLocation(), entityName(killer), entityName(victim), weapon);
} }