From 53d24e2b22c29b2ae0ab96af4855d932b8428454 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 2 Nov 2012 18:55:42 +1100 Subject: [Bleeding] Fix mistranslation affecting time of the server vs time of day. Fixes BUKKIT-2797 --- src/main/java/net/minecraft/server/EntityPlayer.java | 4 ++-- src/main/java/net/minecraft/server/MinecraftServer.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/net') diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 2ceeac08..6130cd64 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -739,10 +739,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public long getPlayerTime() { if (this.relativeTime) { // Adds timeOffset to the current server time. - return this.world.getTime() + this.timeOffset; + return this.world.F() + this.timeOffset; } else { // Adds timeOffset to the beginning of this day. - return this.world.getTime() - (this.world.getTime() % 24000) + this.timeOffset; + return this.world.F() - (this.world.F() % 24000) + this.timeOffset; } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 349458bb..dd2d741d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -530,7 +530,7 @@ public abstract class MinecraftServer implements Runnable, IMojangStatistics, IC if (this.ticks % 20 == 0) { for (int i = 0; i < this.getServerConfigurationManager().players.size(); ++i) { EntityPlayer entityplayer = (EntityPlayer) this.getServerConfigurationManager().players.get(i); - entityplayer.netServerHandler.sendPacket(new Packet4UpdateTime(entityplayer.getPlayerTime(), entityplayer.world.F())); // Add support for per player time + entityplayer.netServerHandler.sendPacket(new Packet4UpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime())); // Add support for per player time } } -- cgit v1.2.3