Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-01-12 19:30:48 +01:00
Code Issues Projects Releases Wiki Activity

updated tnt fix, updated respawn teleport

Browse Source
This commit is contained in:
Redecouverte 2011-02-27 17:00:34 +01:00
parent 881846d301
commit d042b785ed
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
View File

@ -261,7 +261,8 @@ public void onEntityExplode(EntityExplodeEvent event) {
} }
WorldGuardConfiguration cfg = plugin.getWgConfiguration(); WorldGuardConfiguration cfg = plugin.getWgConfiguration();
WorldGuardWorldConfiguration wcfg = cfg.getWorldConfig(event.getLocation().getWorld().getName()); Location l = event.getLocation();
WorldGuardWorldConfiguration wcfg = cfg.getWorldConfig(l.getWorld().getName());
if (event.getEntity() instanceof LivingEntity) { if (event.getEntity() instanceof LivingEntity) {
@ -277,8 +278,8 @@ public void onEntityExplode(EntityExplodeEvent event) {
} }
if (wcfg.useRegions) { if (wcfg.useRegions) {
Vector pt = toVector(event.getEntity().getLocation()); Vector pt = toVector(l);
RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(event.getLocation().getWorld().getName()); RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(wcfg.getWorldName());
if (!mgr.getApplicableRegions(pt) if (!mgr.getApplicableRegions(pt)
.allowsFlag(AreaFlags.FLAG_CREEPER_EXPLOSION)) { .allowsFlag(AreaFlags.FLAG_CREEPER_EXPLOSION)) {
@ -293,8 +294,8 @@ public void onEntityExplode(EntityExplodeEvent event) {
} }
if (wcfg.useRegions && event.getEntity() != null) { if (wcfg.useRegions && event.getEntity() != null) {
Vector pt = toVector(event.getEntity().getLocation()); Vector pt = toVector(l);
RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(event.getLocation().getWorld().getName()); RegionManager mgr = plugin.getGlobalRegionManager().getRegionManager(wcfg.getWorldName());
if (!mgr.getApplicableRegions(pt) if (!mgr.getApplicableRegions(pt)
.allowsFlag(AreaFlags.FLAG_TNT)) { .allowsFlag(AreaFlags.FLAG_TNT)) {

8
src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
View File

@ -266,17 +266,17 @@ public void onPlayerRespawn(PlayerRespawnEvent event) {
BukkitPlayer localPlayer = BukkitPlayer.wrapPlayer(cfg, player); BukkitPlayer localPlayer = BukkitPlayer.wrapPlayer(cfg, player);
if (spawnconfig.equals("owner")) { if (spawnconfig.equals("owner")) {
if (regions.isOwner(localPlayer)) { if (regions.isOwner(localPlayer)) {
player.teleportTo(spawn); event.setRespawnLocation(spawn);
} }
} else if (spawnconfig.equals("member")) { } else if (spawnconfig.equals("member")) {
if (regions.isMember(localPlayer)) { if (regions.isMember(localPlayer)) {
player.teleportTo(spawn); event.setRespawnLocation(spawn);
} }
} else { } else {
player.teleportTo(spawn); event.setRespawnLocation(spawn);
} }
} else { } else {
player.teleportTo(spawn); event.setRespawnLocation(spawn);
} }
} }
} }