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

Target default world when returning from The End; Fixes BUKKIT-3494

Browse Source 
Due to the having to generate new logic to avoid using the customized
PlayerConnection.moveToWorld, entities returning from The End were not
properly calculating their exit target.  This commit corrects that
logic.
This commit is contained in:
EdGruberman 2013-01-24 17:37:01 -07:00 committed by feildmaster
parent 50e74b3b49
commit 132fdbc4ac
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/Entity.java
View File

@ -1762,9 +1762,11 @@ public abstract class Entity {
Location enter = this.getBukkitEntity().getLocation();
Location exit = exitWorld != null ? minecraftserver.getPlayerList().calculateTarget(enter, minecraftserver.getWorldServer(i)) : null;
boolean useTravelAgent = exitWorld != null && !(this.dimension == 1 && exitWorld.dimension == 1); // don't use agent for custom worlds or return from THE_END
TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().s() : null;
EntityPortalEvent event = new EntityPortalEvent(this.getBukkitEntity(), enter, exit, agent);
event.useTravelAgent(useTravelAgent);
event.getEntity().getServer().getPluginManager().callEvent(event);
if (event.isCancelled() || event.getTo() == null || !this.isAlive()) {
return;

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

@ -436,18 +436,22 @@ public abstract class PlayerList {
Location enter = entityplayer.getBukkitEntity().getLocation();
Location exit = null;
boolean useTravelAgent = false; // don't use agent for custom worlds or return from THE_END
if (exitWorld != null) {
if ((cause == TeleportCause.END_PORTAL) && (i == 0)) {
// THE_END -> NORMAL; use bed if available
// THE_END -> NORMAL; use bed if available, otherwise default spawn
exit = ((CraftPlayer) entityplayer.getBukkitEntity()).getBedSpawnLocation();
}
if (exit == null) {
if (exit == null) exit = exitWorld.getWorld().getSpawnLocation();
} else {
// NORMAL <-> NETHER or NORMAL -> THE_END
exit = this.calculateTarget(enter, exitWorld);
useTravelAgent = true;
}
}
TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().s() : null;
PlayerPortalEvent event = new PlayerPortalEvent(entityplayer.getBukkitEntity(), enter, exit, agent, cause);
event.useTravelAgent(useTravelAgent);
Bukkit.getServer().getPluginManager().callEvent(event);
if (event.isCancelled() || event.getTo() == null) {
return;
@ -517,6 +521,8 @@ public abstract class PlayerList {
ChunkCoordinates chunkcoordinates;
if (i == 1) {
// use default NORMAL world spawn instead of target
worldserver1 = this.server.worlds.get(0);
chunkcoordinates = worldserver1.getSpawn();
} else {
chunkcoordinates = worldserver1.getDimensionSpawn();
@ -553,7 +559,7 @@ public abstract class PlayerList {
}
// entity.spawnIn(worldserver1);
return new Location(target.getWorld(), d0, y, d1, yaw, pitch);
return new Location(worldserver1.getWorld(), d0, y, d1, yaw, pitch);
}
// copy of original a(Entity, int, WorldServer, WorldServer) method with only entity repositioning logic

6
src/main/java/net/minecraft/server/PortalTravelAgent.java
View File

@ -185,9 +185,9 @@ public class PortalTravelAgent {
// entity.setPositionRotation((double) i, (double) j, (double) k, entity.yaw, 0.0F);
// entity.motX = entity.motY = entity.motZ = 0.0D;
position.setPitch(0.0F);
position.setX(0);
position.setY(0);
position.setZ(0);
velocity.setX(0);
velocity.setY(0);
velocity.setZ(0);
} else {
double d4;
int k1;