twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-14 11:45:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added per player time support. Thanks eisental, Shamebot and needspeed10!

Browse Source
This commit is contained in:
EvilSeph
2011-06-17 02:29:16 -04:00
parent a70a5abc3d
commit cc1b0a005c
5 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minecraft/server/EntityPlayer.java
View File

@@ -483,6 +483,19 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// CraftBukkit start
public long timeOffset = 0;
public boolean relativeTime = true;
public long getPlayerTime() {
if (relativeTime) {
// Adds timeOffset to the current server time.
return world.getTime() + timeOffset;
} else {
// Adds timeOffset to the beginning of this day.
return world.getTime() - (world.getTime() % 24000) + timeOffset;
}
}
@Override
public String toString() {
return super.toString() + "(" + name + " at " + locX + "," + locY + "," + locZ + ")";

4
src/main/java/net/minecraft/server/MinecraftServer.java
View File

@@ -177,7 +177,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
File newWorld = new File(new File(name), dim);
File oldWorld = new File(new File(s), dim);
if ((!newWorld.isDirectory()) && (oldWorld.isDirectory())) {
log.info("---- Migration of old " + worldType + " folder required ----");
log.info("Unfortunately due to the way that Minecraft implemented multiworld support in 1.6, Bukkit requires that you move your " + worldType + " folder to a new location in order to operate correctly.");
@@ -411,7 +411,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
// CraftBukkit start - only send timeupdates to the people in that world
for (int i = 0; i < this.serverConfigurationManager.players.size(); ++i) {
EntityPlayer entityplayer = (EntityPlayer) this.serverConfigurationManager.players.get(i);
entityplayer.netServerHandler.sendPacket(new Packet4UpdateTime(entityplayer.world.getTime()));
entityplayer.netServerHandler.sendPacket(new Packet4UpdateTime(entityplayer.getPlayerTime())); // Add support for per player time
}
}

2
src/main/java/net/minecraft/server/NetLoginHandler.java
View File

@@ -97,7 +97,7 @@ public class NetLoginHandler extends NetHandler {
this.server.serverConfigurationManager.c(entityplayer);
netserverhandler.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
this.server.networkListenThread.a(netserverhandler);
netserverhandler.sendPacket(new Packet4UpdateTime(worldserver.getTime()));
netserverhandler.sendPacket(new Packet4UpdateTime(entityplayer.getPlayerTime())); // CraftBukkit - add support for player specific time
entityplayer.syncInventory();
}