From 6c0af886b1bf4953291e3c927a4b38ca009d31f9 Mon Sep 17 00:00:00 2001 From: Garbage Mule Date: Sun, 21 Aug 2011 12:41:46 +0200 Subject: [PATCH] Monsters no longer target pet wolves in the arena. --- MobArena.jar | Bin 237228 -> 237262 bytes src/com/garbagemule/MobArena/ArenaMaster.java | 9 ++------- src/com/garbagemule/MobArena/MAListener.java | 18 +++++++----------- .../garbagemule/MobArena/MASpawnThread.java | 5 +++++ src/com/garbagemule/MobArena/MobArena.java | 11 +++-------- 5 files changed, 17 insertions(+), 26 deletions(-) diff --git a/MobArena.jar b/MobArena.jar index b9a363f5a496202f683c2449d1cc1d23232f0eb1..dfa8beef64beb154f4600aeb36819c84a8b3ff0a 100644 GIT binary patch delta 19499 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 JIlzR>001$@eS-i1 delta 19157 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 a&LWTqfD+<#_n3uL7lCMzy_}&nM)-enV1XF` diff --git a/src/com/garbagemule/MobArena/ArenaMaster.java b/src/com/garbagemule/MobArena/ArenaMaster.java index 6050c98..00343e6 100644 --- a/src/com/garbagemule/MobArena/ArenaMaster.java +++ b/src/com/garbagemule/MobArena/ArenaMaster.java @@ -15,9 +15,9 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.util.config.Configuration; -import com.garbagemule.ArenaPlugin.Master; +//import com.garbagemule.ArenaPlugin.Master; -public class ArenaMaster implements Master +public class ArenaMaster //implements Master { private MobArena plugin; private Configuration config; @@ -392,9 +392,4 @@ public class ArenaMaster implements Master public void updateClasses() { update(false, true, false); } public void updateArenas() { update(false, false, true); } public void updateAll() { update(true, true, true); } - - public Map getArenaMap() - { - return null;//arenaMap; - } } diff --git a/src/com/garbagemule/MobArena/MAListener.java b/src/com/garbagemule/MobArena/MAListener.java index 5b46fd8..cc8e2ad 100644 --- a/src/com/garbagemule/MobArena/MAListener.java +++ b/src/com/garbagemule/MobArena/MAListener.java @@ -396,27 +396,23 @@ public class MAListener implements ArenaListener // If the target is a player, cancel. event.setCancelled(true); - return; } - if (arena.monsters.contains(event.getEntity())) + else if (arena.monsters.contains(event.getEntity())) { if (event.getReason() == TargetReason.FORGOT_TARGET) - { event.setTarget(MAUtils.getClosestPlayer(event.getEntity(), arena)); - return; - } - if (event.getReason() == TargetReason.TARGET_DIED) - { + else if (event.getReason() == TargetReason.TARGET_DIED) event.setTarget(MAUtils.getClosestPlayer(event.getEntity(), arena)); - return; - } - if (event.getReason() == TargetReason.CLOSEST_PLAYER) + else if (event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY) + if (arena.pets.contains(event.getTarget())) + event.setCancelled(true); + + else if (event.getReason() == TargetReason.CLOSEST_PLAYER) if (!arena.arenaPlayers.contains(event.getTarget())) event.setCancelled(true); - return; } } diff --git a/src/com/garbagemule/MobArena/MASpawnThread.java b/src/com/garbagemule/MobArena/MASpawnThread.java index df0da9c..d70658d 100644 --- a/src/com/garbagemule/MobArena/MASpawnThread.java +++ b/src/com/garbagemule/MobArena/MASpawnThread.java @@ -86,8 +86,13 @@ public class MASpawnThread implements Runnable { List tmp = new LinkedList(arena.monsters); for (Entity e : tmp) + { if (e.isDead() || !arena.inRegion(e.getLocation())) + { arena.monsters.remove(e); + e.remove(); + } + } } private void grantRewards(int wave) diff --git a/src/com/garbagemule/MobArena/MobArena.java b/src/com/garbagemule/MobArena/MobArena.java index 5b12dea..eb29a6c 100644 --- a/src/com/garbagemule/MobArena/MobArena.java +++ b/src/com/garbagemule/MobArena/MobArena.java @@ -21,14 +21,14 @@ import com.nijikokun.bukkit.Permissions.Permissions; import com.garbagemule.MobArena.util.FileUtils; import com.garbagemule.register.payment.Method; import com.garbagemule.register.payment.Methods; -import com.garbagemule.ArenaPlugin.ArenaPlugin; -import com.garbagemule.ArenaPlugin.Master; +//import com.garbagemule.ArenaPlugin.ArenaPlugin; +//import com.garbagemule.ArenaPlugin.Master; /** * MobArena * @author garbagemule */ -public class MobArena extends JavaPlugin implements ArenaPlugin +public class MobArena extends JavaPlugin// implements ArenaPlugin { private Configuration config; private ArenaMaster am; @@ -181,11 +181,6 @@ public class MobArena extends JavaPlugin implements ArenaPlugin public ArenaMaster getAM() { return am; } // More convenient. public ArenaMaster getArenaMaster() { return am; } - public Master getMaster() - { - return am; - } - private String getHeader() { String sep = System.getProperty("line.separator");