diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-04-27 04:40:05 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-04-27 10:42:19 -0500 |
commit | 799779e4b19605dc7d7befd0b530caf640214d14 (patch) | |
tree | c4f636429e8ea3aec489f6f619dc23b733862ae2 /src/main/java/net/minecraft/server/PlayerList.java | |
parent | 83c3aa188bbde405f584f7b66e4fe5cab90aff35 (diff) | |
download | craftbukkit-799779e4b19605dc7d7befd0b530caf640214d14.tar craftbukkit-799779e4b19605dc7d7befd0b530caf640214d14.tar.gz craftbukkit-799779e4b19605dc7d7befd0b530caf640214d14.tar.lz craftbukkit-799779e4b19605dc7d7befd0b530caf640214d14.tar.xz craftbukkit-799779e4b19605dc7d7befd0b530caf640214d14.zip |
Update CraftBukkit to Minecraft 1.5.2
Diffstat (limited to 'src/main/java/net/minecraft/server/PlayerList.java')
-rw-r--r-- | src/main/java/net/minecraft/server/PlayerList.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java index ed670d92..9e574bec 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -504,7 +504,7 @@ public abstract class PlayerList { } } - TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().s() : org.bukkit.craftbukkit.CraftTravelAgent.DEFAULT; // return arbitrary TA to compensate for implementation dependent plugins + TravelAgent agent = exit != null ? (TravelAgent) ((CraftWorld) exit.getWorld()).getHandle().t() : org.bukkit.craftbukkit.CraftTravelAgent.DEFAULT; // return arbitrary TA to compensate for implementation dependent plugins PlayerPortalEvent event = new PlayerPortalEvent(entityplayer.getBukkitEntity(), enter, exit, agent, cause); event.useTravelAgent(useTravelAgent); Bukkit.getServer().getPluginManager().callEvent(event); @@ -521,7 +521,7 @@ public abstract class PlayerList { Vector velocity = entityplayer.getBukkitEntity().getVelocity(); boolean before = exitWorld.chunkProviderServer.forceChunkLoad; exitWorld.chunkProviderServer.forceChunkLoad = true; - exitWorld.s().adjustExit(entityplayer, exit, velocity); + exitWorld.t().adjustExit(entityplayer, exit, velocity); // Should be getTravelAgent exitWorld.chunkProviderServer.forceChunkLoad = before; this.moveToWorld(entityplayer, exitWorld.dimension, true, exit, false); // Vanilla doesn't check for suffocation when handling portals, so neither should we @@ -609,7 +609,7 @@ public abstract class PlayerList { worldserver1.addEntity(entity); entity.setPositionRotation(d0, entity.locY, d1, entity.yaw, entity.pitch); worldserver1.entityJoinedWorld(entity, false); - worldserver1.s().a(entity, d3, d4, d5, f); + worldserver1.t().a(entity, d3, d4, d5, f); } worldserver.methodProfiler.b(); @@ -688,7 +688,7 @@ public abstract class PlayerList { // worldserver1.s().a(entity, d3, d4, d5, f); if (portal) { Vector velocity = entity.getBukkitEntity().getVelocity(); - worldserver1.s().adjustExit(entity, exit, velocity); + worldserver1.t().adjustExit(entity, exit, velocity); // Should be getTravelAgent entity.setPositionRotation(exit.getX(), exit.getY(), exit.getZ(), exit.getYaw(), exit.getPitch()); if (entity.motX != velocity.getX() || entity.motY != velocity.getY() || entity.motZ != velocity.getZ()) { entity.getBukkitEntity().setVelocity(velocity); @@ -797,7 +797,7 @@ public abstract class PlayerList { return this.operators.contains(s.trim().toLowerCase()) || this.server.I() && this.server.worlds.get(0).getWorldData().allowCommands() && this.server.H().equalsIgnoreCase(s) || this.m; } - public EntityPlayer f(String s) { + public EntityPlayer getPlayer(String s) { Iterator iterator = this.players.iterator(); EntityPlayer entityplayer; @@ -976,7 +976,7 @@ public abstract class PlayerList { public void b(EntityPlayer entityplayer, WorldServer worldserver) { entityplayer.playerConnection.sendPacket(new Packet4UpdateTime(worldserver.getTime(), worldserver.getDayTime())); - if (worldserver.O()) { + if (worldserver.P()) { entityplayer.setPlayerWeather(org.bukkit.WeatherType.DOWNFALL, false); // CraftBukkit - handle player specific weather } } |