SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

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

Quellcode durchsuchen 
Fixes BUKKIT-2797
Dieser Commit ist enthalten in:
md_5 2012-11-02 18:55:42 +11:00 committet von EvilSeph
Ursprung 3dd0580d50
Commit 53d24e2b22
3 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
src/main/java/net/minecraft/server/EntityPlayer.java
Datei anzeigen

@ -739,10 +739,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public long getPlayerTime() { public long getPlayerTime() {
if (this.relativeTime) { if (this.relativeTime) {
// Adds timeOffset to the current server time. // Adds timeOffset to the current server time.
return this.world.getTime() + this.timeOffset; return this.world.F() + this.timeOffset;
} else { } else {
// Adds timeOffset to the beginning of this day. // 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
Datei anzeigen

@ -530,7 +530,7 @@ public abstract class MinecraftServer implements Runnable, IMojangStatistics, IC
if (this.ticks % 20 == 0) { if (this.ticks % 20 == 0) {
for (int i = 0; i < this.getServerConfigurationManager().players.size(); ++i) { for (int i = 0; i < this.getServerConfigurationManager().players.size(); ++i) {
EntityPlayer entityplayer = (EntityPlayer) this.getServerConfigurationManager().players.get(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
Datei anzeigen

@ -419,7 +419,7 @@ public class CraftWorld implements World {
} }
public long getFullTime() { public long getFullTime() {
return world.getTime(); return world.F();
} }
public void setFullTime(long time) { public void setFullTime(long time) {
@ -430,7 +430,7 @@ public class CraftWorld implements World {
CraftPlayer cp = (CraftPlayer) p; CraftPlayer cp = (CraftPlayer) p;
if (cp.getHandle().netServerHandler == null) continue; 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()));
} }
} }