From 1aa81ef9407da744e5e608c40744fa88b5b5daa5 Mon Sep 17 00:00:00 2001 From: HappyPikachu Date: Mon, 5 Jan 2015 19:48:38 -0500 Subject: [PATCH] Update getShooter() to getLastDamageCause() for players --- .../me/blackvein/quests/PlayerListener.java | 12 +++++----- src/main/java/me/blackvein/quests/Quest.java | 3 ++- src/main/java/me/blackvein/quests/Stage.java | 22 ++++++++++++++----- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/main/java/me/blackvein/quests/PlayerListener.java b/src/main/java/me/blackvein/quests/PlayerListener.java index b06880d02..d6bd7c3d7 100644 --- a/src/main/java/me/blackvein/quests/PlayerListener.java +++ b/src/main/java/me/blackvein/quests/PlayerListener.java @@ -576,10 +576,9 @@ public class PlayerListener implements Listener, ColorUtil { if (damager instanceof Projectile) { - Projectile p = (Projectile) damager; - if (p.getShooter() instanceof Player) { + if(evt.getEntity().getLastDamageCause().getEntity() instanceof Player) { - Player player = (Player) p.getShooter(); + Player player = (Player) evt.getEntity().getLastDamageCause().getEntity(); boolean okay = true; if (plugin.citizens != null) { @@ -648,11 +647,10 @@ public class PlayerListener implements Listener, ColorUtil { if (damager != null) { if (damager instanceof Projectile) { + + if(evt.getEntity().getLastDamageCause().getEntity() instanceof Player) { - Projectile p = (Projectile) damager; - if (p.getShooter() instanceof Player) { - - Player player = (Player) p.getShooter(); + Player player = (Player) evt.getEntity().getLastDamageCause().getEntity(); if (plugin.checkQuester(player.getName()) == false) { diff --git a/src/main/java/me/blackvein/quests/Quest.java b/src/main/java/me/blackvein/quests/Quest.java index 55f05df67..4a4208ffc 100644 --- a/src/main/java/me/blackvein/quests/Quest.java +++ b/src/main/java/me/blackvein/quests/Quest.java @@ -177,7 +177,8 @@ public class Quest { return testRequirements(quester.getPlayer()); } - public boolean testRequirements(Player player) { + @SuppressWarnings("deprecation") + public boolean testRequirements(Player player) { Quester quester = plugin.getQuester(player.getUniqueId()); diff --git a/src/main/java/me/blackvein/quests/Stage.java b/src/main/java/me/blackvein/quests/Stage.java index 754ac36a6..e586a20d2 100644 --- a/src/main/java/me/blackvein/quests/Stage.java +++ b/src/main/java/me/blackvein/quests/Stage.java @@ -4,6 +4,7 @@ import java.util.EnumMap; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; + import org.bukkit.DyeColor; import org.bukkit.Location; import org.bukkit.Material; @@ -32,12 +33,15 @@ public class Stage { LinkedList itemsToDeliver = new LinkedList(); LinkedList itemDeliveryTargets = new LinkedList() { - @Override + private static final long serialVersionUID = -2774443496142382127L; + + @Override public boolean equals(Object o) { if (o instanceof LinkedList) { - LinkedList otherList = (LinkedList) o; + @SuppressWarnings("unchecked") + LinkedList otherList = (LinkedList) o; for (Integer i : this) { @@ -58,12 +62,15 @@ public class Stage { public LinkedList citizensToInteract = new LinkedList() { - @Override + private static final long serialVersionUID = -4086855121042524435L; + + @Override public boolean equals(Object o) { if (o instanceof LinkedList) { - LinkedList otherList = (LinkedList) o; + @SuppressWarnings("unchecked") + LinkedList otherList = (LinkedList) o; for (Integer i : this) { @@ -82,12 +89,15 @@ public class Stage { }; public LinkedList citizensToKill = new LinkedList() { - @Override + private static final long serialVersionUID = 7705964814014176415L; + + @Override public boolean equals(Object o) { if (o instanceof LinkedList) { - LinkedList otherList = (LinkedList) o; + @SuppressWarnings("unchecked") + LinkedList otherList = (LinkedList) o; for (Integer i : this) {