From 5e7cb2a82b6b60d37949b7a97ec7cb17def7b3e7 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Mon, 31 Dec 2018 14:20:27 +0100 Subject: [PATCH] Allow class pets to teleport to their owners. This closes #497. --- changelog.md | 1 + src/main/java/com/garbagemule/MobArena/ArenaListener.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index ea50b1b..21eedc7 100644 --- a/changelog.md +++ b/changelog.md @@ -14,6 +14,7 @@ These changes will (most likely) be included in the next version. - Like the other user commands, the permission for `/ma ready` now defaults to true. - Unbreakable weapons and armor now use the unbreakable item flag instead of item durability and on-hit repairs. This means that MobArena's unbreakable items are now compatible with plugins that depend on special durability values, such as QualityArmory. - Spectators can no longer take damage when the arena isn't running. +- Pets can now teleport back to their owners if they get too far away. ## [0.103] - 2018-08-28 - It is now possible to add a fixed delay (in seconds) between waves with the new per-arena setting `next-wave-delay`. diff --git a/src/main/java/com/garbagemule/MobArena/ArenaListener.java b/src/main/java/com/garbagemule/MobArena/ArenaListener.java index b9a70ea..2909e28 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaListener.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaListener.java @@ -885,6 +885,9 @@ public class ArenaListener } public void onEntityTeleport(EntityTeleportEvent event) { + if (monsters.hasPet(event.getEntity()) && region.contains(event.getTo())) { + return; + } if (region.contains(event.getFrom()) || region.contains(event.getTo())) { event.setCancelled(true); }