OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-20 23:46:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

[Bleeding] Fix mistranslation affecting time of the server vs time of day.

Browse source 
Fixes BUKKIT-2797
This commit is contained in:
md_5 2012-11-02 18:55:42 +11:00 committed by EvilSeph
parent 3dd0580d50
commit 53d24e2b22
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/minecraft/server/EntityPlayer.java
View file

@ -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;
}
}

2
src/main/java/net/minecraft/server/MinecraftServer.java
View file

@ -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
}
}

4
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View file

@ -419,7 +419,7 @@ public class CraftWorld implements World {
}
public long getFullTime() {
return world.getTime();
return world.F();
}
public void setFullTime(long time) {
@ -430,7 +430,7 @@ public class CraftWorld implements World {
CraftPlayer cp = (CraftPlayer) p;
if (cp.getHandle().netServerHandler == null) continue;
cp.getHandle().netServerHandler.sendPacket(new Packet4UpdateTime(cp.getHandle().getPlayerTime(), cp.getHandle().world.F()));
cp.getHandle().netServerHandler.sendPacket(new Packet4UpdateTime(cp.getHandle().world.getTime(), cp.getHandle().getPlayerTime()));
}
}