Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compat with ProjectileSource

Browse Source
This commit is contained in:
Olof Larsson 2014-03-27 00:13:41 +01:00
parent c548ed86d9
commit 6bd4581d80
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/massivecraft/factions/listeners/FactionsListenerMain.java
View File

@ -17,7 +17,6 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.ItemFrame; import org.bukkit.entity.ItemFrame;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.entity.Wither; import org.bukkit.entity.Wither;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -53,6 +52,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerKickEvent; import org.bukkit.event.player.PlayerKickEvent;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.projectiles.ProjectileSource;
import com.massivecraft.factions.FFlag; import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FPerm; import com.massivecraft.factions.FPerm;
@ -260,7 +260,10 @@ public class FactionsListenerMain implements Listener
// If a harmful potion is splashing ... // If a harmful potion is splashing ...
if (!MUtil.isHarmfulPotion(event.getPotion())) return; if (!MUtil.isHarmfulPotion(event.getPotion())) return;
Entity thrower = event.getPotion().getShooter(); ProjectileSource projectileSource = event.getPotion().getShooter();
if (! (projectileSource instanceof Entity)) return;
Entity thrower = (Entity)projectileSource;
// ... scan through affected entities to make sure they're all valid targets. // ... scan through affected entities to make sure they're all valid targets.
for (LivingEntity affectedEntity : event.getAffectedEntities()) for (LivingEntity affectedEntity : event.getAffectedEntities())
@ -295,11 +298,8 @@ public class FactionsListenerMain implements Listener
if (UConf.isDisabled(defender)) return true; if (UConf.isDisabled(defender)) return true;
// ... and the attacker is someone else ... // ... and the attacker is someone else ...
Entity eattacker = event.getDamager(); Entity eattacker = MUtil.getLiableDamager(event);
if (eattacker instanceof Projectile)
{
eattacker = ((Projectile)eattacker).getShooter();
}
// (we check null here since there may not be an attacker) // (we check null here since there may not be an attacker)
// (lack of attacker situations can be caused by other bukkit plugins) // (lack of attacker situations can be caused by other bukkit plugins)
if (eattacker != null && eattacker.equals(edefender)) return true; if (eattacker != null && eattacker.equals(edefender)) return true;