summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2011-12-10 13:58:00 -0500
committerEvilSeph <evilseph@gmail.com>2011-12-10 15:15:27 -0500
commitec59dd917390085e0a6a89622ba62527bc65ab11 (patch)
tree167f6aa85c264208fe4c719f5f32119d14c13881 /src/main/java/net
parent84a19565d4893165d8d226c3d8dda1a296cbcc61 (diff)
downloadcraftbukkit-ec59dd917390085e0a6a89622ba62527bc65ab11.tar
craftbukkit-ec59dd917390085e0a6a89622ba62527bc65ab11.tar.gz
craftbukkit-ec59dd917390085e0a6a89622ba62527bc65ab11.tar.lz
craftbukkit-ec59dd917390085e0a6a89622ba62527bc65ab11.tar.xz
craftbukkit-ec59dd917390085e0a6a89622ba62527bc65ab11.zip
Fixed issues in our handling of The End as per BUKKIT-11.
This also addresses BUKKIT-27.
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/EntityPlayer.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 013dfe97..93b4b541 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -323,11 +323,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.netServerHandler.sendPacket(new Packet70Bed(4, 0));
} else {
this.a((Statistic) AchievementList.B);
+ /* //CraftBukkit start - removed to fix our handling of The End portals
ChunkCoordinates chunkcoordinates = this.b.getWorldServer(i).d();
if (chunkcoordinates != null) {
this.netServerHandler.a((double) chunkcoordinates.x, (double) chunkcoordinates.y, (double) chunkcoordinates.z, 0.0F, 0.0F);
}
+ //CraftBukkit end */
this.b.serverConfigurationManager.changeDimension(this, 1);
this.cf = -1;