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

Make portal protection slightly less overprotective.

Browse Source 
Fixes end portal usage.
Fixes WORLDGUARD-3497.
This commit is contained in:
wizjany 2015-06-05 22:08:07 -04:00 committed by sk89q
parent 463a356020
commit 2d28e8db6d
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java
View File

@ -38,6 +38,7 @@
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.TravelAgent;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
@ -371,13 +372,27 @@ public void onPlayerTeleport(PlayerTeleportEvent event) {
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
public void onPlayerPortal(PlayerPortalEvent event) {
// hackily estimate the area that could be effected by this event, since the server refuses to tell us
int radius;
if (event.getPortalTravelAgent() != null) {
radius = event.getPortalTravelAgent().getCreationRadius();
} else {
radius = 16; // from CraftTravelAgent
if (event.getCause() != TeleportCause.NETHER_PORTAL) {
return;
}
if (event.getTo() == null) { // apparently this counts as a cancelled event, implementation specific though
return;
}
if (!event.useTravelAgent()) { // either end travel (even though we checked cause) or another plugin is fucking with us, shouldn't create a portal though
return;
}
TravelAgent pta = event.getPortalTravelAgent();
if (pta == null) { // possible, but shouldn't create a portal
return;
}
if (pta.findPortal(event.getTo()) != null) {
return; // portal exists...it shouldn't make a new one
}
// HOPEFULLY covered everything the server can throw at us...proceed protection checking
// a lot of that is implementation specific though
// hackily estimate the area that could be effected by this event, since the server refuses to tell us
int radius = pta.getCreationRadius();
Location min = event.getTo().clone().subtract(radius, radius, radius);
Location max = event.getTo().clone().add(radius, radius, radius);
World world = event.getTo().getWorld();