skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Spigot issue with skeleton/wolf targetting.

Browse Source
This commit is contained in:
garbagemule
2014-12-13 20:29:02 +01:00
parent 2e397fd123
commit e663a10a2a
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/plugin.yml
+1 -1
View File
@@ -1,7 +1,7 @@
name: MobArena name: MobArena
author: garbagemule author: garbagemule
main: com.garbagemule.MobArena.MobArena main: com.garbagemule.MobArena.MobArena
version: 0.96.8.3 version: 0.96.8.4
softdepend: [Multiverse-Core,Towny,Heroes,MagicSpells,Vault] softdepend: [Multiverse-Core,Towny,Heroes,MagicSpells,Vault]
commands: commands:
ma: ma:
src/com/garbagemule/MobArena/ArenaListener.java
+14 -21
View File
@@ -31,7 +31,6 @@ import org.bukkit.event.entity.FoodLevelChangeEvent;
import org.bukkit.event.entity.PotionSplashEvent; import org.bukkit.event.entity.PotionSplashEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.hanging.HangingBreakEvent; import org.bukkit.event.hanging.HangingBreakEvent;
import org.bukkit.event.player.*; import org.bukkit.event.player.*;
@@ -790,32 +789,26 @@ public class ArenaListener
return; return;
if (arena.hasPet(event.getEntity())) { if (arena.hasPet(event.getEntity())) {
if (event.getReason() != TargetReason.TARGET_ATTACKED_OWNER && event.getReason() != TargetReason.OWNER_ATTACKED_TARGET) // Pets should never attack players
return; if (event.getTarget() instanceof Player) {
event.setCancelled(true);
if (!(event.getTarget() instanceof Player)) }
return;
// If the target is a player, cancel.
event.setCancelled(true);
} }
else if (monsters.getMonsters().contains(event.getEntity())) { else if (monsters.getMonsters().contains(event.getEntity())) {
if (event.getReason() == TargetReason.FORGOT_TARGET) { // If the target is null, we probably forgot or the target died
if (event.getTarget() == null) {
event.setTarget(MAUtils.getClosestPlayer(plugin, event.getEntity(), arena)); event.setTarget(MAUtils.getClosestPlayer(plugin, event.getEntity(), arena));
} }
else if (event.getReason() == TargetReason.TARGET_DIED) {
event.setTarget(MAUtils.getClosestPlayer(plugin, event.getEntity(), arena)); // Pets are untargetable
else if (arena.hasPet(event.getTarget())) {
event.setCancelled(true);
} }
else if (event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY) {
if (arena.hasPet(event.getTarget())) { // So are non-arena players
event.setCancelled(true); else if (event.getTarget() instanceof Player && !arena.inArena((Player) event.getTarget())) {
} event.setCancelled(true);
}
else if (event.getReason() == TargetReason.CLOSEST_PLAYER) {
if (!arena.inArena((Player) event.getTarget())) {
event.setCancelled(true);
}
} }
} }
} }