Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 19:46:21 +01:00
Code Issues Projects Releases Wiki Activity

Prevent Nether Portals from teleporting the player from Bukkit worlds to the Nether.

Browse Source 
Plugins would need to provide a To Location for Nether Portals to work in Bukkit Worlds.
This commit is contained in:
Rigby 2011-07-26 21:14:52 +01:00 committed by EvilSeph
parent a7f2798862
commit ae43b837b0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minecraft/server/ServerConfigurationManager.java
View File

@ -276,16 +276,24 @@ public class ServerConfigurationManager {
// CraftBukkit start -- Replaced the standard handling of portals with a more customised method. // CraftBukkit start -- Replaced the standard handling of portals with a more customised method.
int dimension = entityplayer.dimension; int dimension = entityplayer.dimension;
WorldServer fromWorld = this.server.getWorldServer(dimension); WorldServer fromWorld = this.server.getWorldServer(dimension);
WorldServer toWorld = this.server.getWorldServer(dimension == -1 ? 0 : -1); WorldServer toWorld = null;
if (dimension < 10) {
int toDimension = dimension == -1 ? 0 : -1;
for (WorldServer world : this.server.worlds) {
if (world.dimension == toDimension) {
toWorld = world;
}
}
}
double blockRatio = dimension == -1 ? 8 : 0.125; double blockRatio = dimension == -1 ? 8 : 0.125;
Location fromLocation = new Location(fromWorld.getWorld(), entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch); Location fromLocation = new Location(fromWorld.getWorld(), entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
Location toLocation = new Location(toWorld.getWorld(), (entityplayer.locX * blockRatio), entityplayer.locY, (entityplayer.locZ * blockRatio), entityplayer.yaw, entityplayer.pitch); Location toLocation = toWorld == null ? null : new Location(toWorld.getWorld(), (entityplayer.locX * blockRatio), entityplayer.locY, (entityplayer.locZ * blockRatio), entityplayer.yaw, entityplayer.pitch);
org.bukkit.craftbukkit.PortalTravelAgent pta = new org.bukkit.craftbukkit.PortalTravelAgent(); org.bukkit.craftbukkit.PortalTravelAgent pta = new org.bukkit.craftbukkit.PortalTravelAgent();
PlayerPortalEvent event = new PlayerPortalEvent((Player) entityplayer.getBukkitEntity(), fromLocation, toLocation, pta); PlayerPortalEvent event = new PlayerPortalEvent((Player) entityplayer.getBukkitEntity(), fromLocation, toLocation, pta);
Bukkit.getServer().getPluginManager().callEvent(event); Bukkit.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled() || event.getTo() == null) {
return; return;
} }