Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-24 11:36:11 +01:00
Code Issues Projects Releases Wiki Activity

Added support for fireballs shot by players being blocked by the PVP flag.

Browse Source
This commit is contained in:
zml2008 2011-12-24 22:49:26 -08:00
parent b29007275f
commit 41f31250a9
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
View File

@ -323,13 +323,24 @@ private void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
return; return;
} }
if (wcfg.useRegions) { if (wcfg.useRegions) {
Fireball fireball = (Fireball) attacker;
Vector pt = toVector(defender.getLocation()); Vector pt = toVector(defender.getLocation());
RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld()); RegionManager mgr = plugin.getGlobalRegionManager().get(player.getWorld());
ApplicableRegionSet set = mgr.getApplicableRegions(pt); ApplicableRegionSet set = mgr.getApplicableRegions(pt);
if (!set.allows(DefaultFlag.GHAST_FIREBALL)) { if (fireball.getShooter() instanceof Player) {
event.setCancelled(true); Vector pt2 = toVector(fireball.getShooter().getLocation());
return; if (!set.allows(DefaultFlag.PVP) || !mgr.getApplicableRegions(pt2).allows(DefaultFlag.PVP)) {
((Player) fireball.getShooter()).sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
event.setCancelled(true);
return;
}
} else {
if (!set.allows(DefaultFlag.GHAST_FIREBALL)) {
event.setCancelled(true);
return;
}
} }
} }
} }