Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5923b7d Fix missing map initialize event call & missing map id assignment (#9756)
PaperMC/Paper@5cbce36 Handle new brand payload type
This commit is contained in:
granny
2023-09-24 14:53:01 -07:00
parent 01e013b173
commit cb4586d9e0
7 changed files with 16 additions and 16 deletions

View File

@@ -564,7 +564,7 @@ index 9dc3dec2bdf2e503fe10364dd4bb5cf662288260..4ab448842dcbf7f0f45d4443d0bb007e
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 1688fdea27342783f91b5cd0a09343ddac77dc6d..ac85cbd677a3833924d3eb393a0c0f5e51ed524e 100644
index 613f1ca115441f6a90830e7be8262493105ddf2f..ef654df11d946cb9560fa05dae86ba727832106e 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -823,12 +823,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -803,10 +803,10 @@ index 7aeaccaa6649a1c93567d07f6b955b9259d3a902..5722265ed3c1b411d2c7bf44d7d42b64
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
index edf3b0baa5a23dd957e2747677595cd5f5f7d55c..274b4cb9d008868d49c9578e15d2fecc50f8af8c 100644
index 9f01f196af0c2d6e331d10015dc1dd3381a94c8f..6f6228edfe77668552a40a814ab3cebd74c4cb5a 100644
--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
@@ -212,7 +212,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -217,7 +217,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
}
protected void keepConnectionAlive() {
@@ -815,7 +815,7 @@ index edf3b0baa5a23dd957e2747677595cd5f5f7d55c..274b4cb9d008868d49c9578e15d2fecc
// Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
// This should effectively place the keepalive handling back to "as it was" before 1.12.2
long currentTime = Util.getMillis();
@@ -248,7 +248,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -253,7 +253,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
}
// Paper end