mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@cd110a8 [ci skip] Update CONTRIBUTING.md (#10318) PaperMC/Paper@e603486 Add onboarding message for initial server start (#10312) PaperMC/Paper@d361a7f Fix DamageSource API (#10307) PaperMC/Paper@99a6416 Expand Hopper BlockState API (#10328)
This commit is contained in:
@@ -18,10 +18,10 @@ index 9ec6145fe04ec64bbee8ec6a837719caebdbc6f5..358d610ad020cada1bb83e393deeeaae
|
||||
public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
|
||||
this.gameTime = time;
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index bbadd5e2611b919b6931277c0225e5bdc1d3baaf..c9754dc72abf9fd4ff005b8a1e48fd3ef9bb1ec9 100644
|
||||
index 87990fd0cb3637779c9750fcc76890dd92873ddd..eef35d73ef1bc1236eeb9ea5202b8939662061fb 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1695,7 +1695,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
@@ -1705,7 +1705,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
long worldTime = level.getGameTime();
|
||||
final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
|
||||
for (Player entityhuman : level.players()) {
|
||||
@@ -31,7 +31,7 @@ index bbadd5e2611b919b6931277c0225e5bdc1d3baaf..c9754dc72abf9fd4ff005b8a1e48fd3e
|
||||
}
|
||||
ServerPlayer entityplayer = (ServerPlayer) entityhuman;
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
index 3319939e53dec5a429be20c3612599f731e6a82c..6d01f9e5e1ea4f01ff9a3e54aa97be6919e3d1fc 100644
|
||||
index d4214258a9c0ec8c738083ee94f3751cae2a7386..833452f7ba410ea482097b78af38f42d3dcfc4e2 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -215,6 +215,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
||||
@@ -88,7 +88,7 @@ index 3319939e53dec5a429be20c3612599f731e6a82c..6d01f9e5e1ea4f01ff9a3e54aa97be69
|
||||
public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
|
||||
Iterator iterator = this.customSpawners.iterator();
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
index 6ec5d3ea5e034066ec0e18c85c4ae59c6a1ddedd..a468de219bfc2c6304d57368c36851b39363b5bb 100644
|
||||
index 848292e607c7977aec8bd81d8bc42398fdffd3dd..ff057de0327eeb15d374c923729dafac5d811f2a 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
@@ -122,6 +122,13 @@ public class PurpurWorldConfig {
|
||||
|
||||
Reference in New Issue
Block a user