mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-22 03:08:16 +02:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@5027a22c fix test PaperMC/Paper@7b1b5f66 applyOrMoveSourcePatches for pre-2 PaperMC/Paper@743ab685 set updatingMinecraft flag PaperMC/Paper@17d72ad2 26.1-rc-1 PaperMC/Paper@42c355e0 update to rc2 PaperMC/Paper@890e3cd4 fix setPlayerTime's rate, call TimeSkipEvent for time set <markerId> PaperMC/Paper@8077ce40 cleanup PlayerInteractEvent PaperMC/Paper@5f86e092 Start porting feature patches PaperMC/Paper@5ba0e30a More feature patches PaperMC/Paper@1abe8fe5 Apply redstone patches PaperMC/Paper@3dfcd069 Simplify CraftStructureManager#loadStructure PaperMC/Paper@392f8bf3 26.1-rc-3
This commit is contained in:
@@ -1,20 +1,20 @@
|
||||
--- a/net/minecraft/world/clock/ServerClockManager.java
|
||||
+++ b/net/minecraft/world/clock/ServerClockManager.java
|
||||
@@ -112,7 +_,7 @@
|
||||
@@ -122,7 +_,7 @@
|
||||
ServerClockManager.ClockInstance instance = this.getInstance(clock);
|
||||
action.accept(instance);
|
||||
Map<Holder<WorldClock>, ClockState> updates = Map.of(clock, instance.packNetworkState(this.server));
|
||||
Map<Holder<WorldClock>, ClockNetworkState> updates = Map.of(clock, instance.packNetworkState(this.server));
|
||||
- this.server.getPlayerList().broadcastAll(new ClientboundSetTimePacket(this.getGameTime(), updates)); // TODO 26.1 per-player time
|
||||
+ this.server.getPlayerList().broadcastAll(new ClientboundSetTimePacket(this.getGameTime(), updates)); // TODO 26.1 per-player time // Purpur - TODO: Configurable daylight cycle
|
||||
this.setDirty();
|
||||
}
|
||||
|
||||
@@ -128,7 +_,7 @@
|
||||
for (ServerLevel level : this.server.getAllLevels()) {
|
||||
@@ -151,7 +_,7 @@
|
||||
// Paper end
|
||||
|
||||
public ClientboundSetTimePacket createFullSyncPacket() {
|
||||
- // TODO 26.1 per-player time
|
||||
+ // TODO 26.1 per-player time // Purpur - TODO: Configurable daylight cycle
|
||||
- // TODO - snapshot: 26.1 per-player time
|
||||
+ // TODO - snapshot: 26.1 per-player time // Purpur - TODO: Configurable daylight cycle
|
||||
return new ClientboundSetTimePacket(this.getGameTime(), Util.mapValues(this.clocks, clock -> clock.packNetworkState(this.server)));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user