Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nether portal fixes and perf optimizations.

Browse Source 
Not checking when it's safe to not check.  Checking maximum one
location.  Unfortunately, asking the portal travel agent to find any
possible existing portal seems both expensive, and unavoidable in the
common case.
This commit is contained in:
ryanhamshire 2015-01-05 21:05:05 -08:00
parent febd8f0525
commit 2c99b3a9e4
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View File

@ -34,6 +34,7 @@ import org.bukkit.Chunk;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.TravelAgent;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
@ -776,28 +777,43 @@ class PlayerEventHandler implements Listener
if(!GriefPrevention.instance.claimsEnabledForWorld(event.getTo().getWorld())) return; if(!GriefPrevention.instance.claimsEnabledForWorld(event.getTo().getWorld())) return;
Player player = event.getPlayer(); Player player = event.getPlayer();
//FEATURE: when players get trapped in a nether portal, send them back through to the other side
if(event.getCause() == TeleportCause.NETHER_PORTAL) if(event.getCause() == TeleportCause.NETHER_PORTAL)
{ {
//FEATURE: when players get trapped in a nether portal, send them back through to the other side
CheckForPortalTrapTask task = new CheckForPortalTrapTask(player, event.getFrom()); CheckForPortalTrapTask task = new CheckForPortalTrapTask(player, event.getFrom());
GriefPrevention.instance.getServer().getScheduler().scheduleSyncDelayedTask(GriefPrevention.instance, task, 100L); GriefPrevention.instance.getServer().getScheduler().scheduleSyncDelayedTask(GriefPrevention.instance, task, 100L);
}
//FEATURE: if the player teleporting doesn't have permission to build a nether portal and none already exists at the destination, cancel the teleportation //FEATURE: if the player teleporting doesn't have permission to build a nether portal and none already exists at the destination, cancel the teleportation
Location existingPortalLocation = event.getPortalTravelAgent().findPortal(event.getTo()); Location destination = event.getTo();
boolean creatingPortal = event.getPortalTravelAgent().getCanCreatePortal() && (existingPortalLocation == null); if(event.useTravelAgent())
//if creating a new portal
if(creatingPortal)
{
//and it goes to a land claim where the player doesn't have permission to build
Claim claim = this.dataStore.getClaimAt(event.getTo(), false, null);
if(claim != null && claim.allowBuild(player, Material.PORTAL) != null)
{ {
//cancel and inform about the reason if(event.getPortalTravelAgent().getCanCreatePortal())
event.setCancelled(true); {
GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoBuildPortalPermission, claim.getOwnerName()); //hypothetically find where the portal would be created if it were
TravelAgent agent = event.getPortalTravelAgent();
agent.setCanCreatePortal(false);
destination = agent.findOrCreate(destination);
agent.setCanCreatePortal(true);
}
else
{
//if not able to create a portal, we don't have to do anything here
return;
}
}
//if creating a new portal
if(destination.getBlock().getType() != Material.PORTAL)
{
//check for a land claim and the player's permission that land claim
Claim claim = this.dataStore.getClaimAt(destination, false, null);
if(claim != null && claim.allowBuild(player, Material.PORTAL) != null)
{
//cancel and inform about the reason
event.setCancelled(true);
GriefPrevention.sendMessage(player, TextMode.Err, Messages.NoBuildPortalPermission, claim.getOwnerName());
}
} }
} }
} }