Upstream
/
war
mirror of https://github.com/taoneill/war.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #498, prevent wolves from teleporting into warzones

This commit is contained in:
Connor Monahan 2017-07-20 18:24:19 -04:00
parent b7cf69666c
commit ddfa24f626
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
war/src/main/java/com/tommytony/war/event/WarEntityListener.java
View File

@ -19,17 +19,8 @@ import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.bukkit.event.entity.*;
import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
import org.bukkit.event.entity.ExplosionPrimeEvent;
import org.bukkit.event.entity.FoodLevelChangeEvent;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.entity.ProjectileHitEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.event.hanging.HangingPlaceEvent;
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
import org.bukkit.inventory.ItemStack;
@ -537,4 +528,18 @@ public class WarEntityListener implements Listener {
War.war.badMsg(player, "build.denied.zone.place");
}
}
@EventHandler
public void onEntityTeleport(final EntityTeleportEvent event) {
if (!War.war.isLoaded()) {
return;
}
if (event.getEntityType() == EntityType.WOLF) {
if (Warzone.getZoneByLocation(event.getTo()) != null) {
// prevent wolves from teleporting to players in zones
event.setCancelled(true);
event.setTo(event.getFrom());
}
}
}
}