Skip to content

Commit 074f57b

Browse files
s-yh-chinas-yh-china
committed
Update Paper
1 parent ff184c1 commit 074f57b

10 files changed

+26
-26
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
group=org.leavesmc.leaves
22
version=1.21.8-R0.1-SNAPSHOT
33
mcVersion=1.21.8
4-
paperRef=614e9acfca696b98b810c65e3582993fcefc321e
4+
paperRef=9aaaadffaa0caad086cf04709904b47eaac161d7
55

66
preVersion=false
77
org.gradle.caching=true

‎leaves-server/minecraft-patches/features/0001-Build-changes.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ index 42899a91b9061b85985fbbd0de4032c757f4aa8f..a93f00d1a64e4deb9b89435bab258f3b
1818
private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger();
1919

2020
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
21-
index 7aac2a6889af3edaebfaf94deecbf00d00758b68..d2895962ad3879632ff7a33eb3ce656097aebaec 100644
21+
index 9243bb11e3f968d0bf0eb2e3dc9295c0232bc15d..9ba90e9e1c6dae13579337edb5a5bede0daa4098 100644
2222
--- a/net/minecraft/server/MinecraftServer.java
2323
+++ b/net/minecraft/server/MinecraftServer.java
24-
@@ -1193,7 +1193,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
24+
@@ -1194,7 +1194,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2525
LOGGER.info("*************************************************************************************");
2626
LOGGER.info("This is the first time you're starting this server.");
2727
LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
@@ -30,7 +30,7 @@ index 7aac2a6889af3edaebfaf94deecbf00d00758b68..d2895962ad3879632ff7a33eb3ce6560
3030
LOGGER.info("*************************************************************************************");
3131
}
3232
// Paper end - Add onboarding message for initial server start
33-
@@ -1855,7 +1855,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
33+
@@ -1856,7 +1856,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
3434

3535
@DontObfuscate
3636
public String getServerModName() {

‎leaves-server/minecraft-patches/features/0004-Leaves-Protocol-Core.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ index fb263fa1f30a7dfcb7ec2656abfb38e5fe88eac9..56fd1ed7ccaf96e7eedea60fbdbf7f93
3333
};
3434
}
3535
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
36-
index c0fa1bba36af367ea81fad4ef44dc25cb84eabd4..d6cd8ac3b44b170b5bb3a530deb406396d0fb7ae 100644
36+
index 9ba90e9e1c6dae13579337edb5a5bede0daa4098..eb6d5e82b6a2576af14c0c080a05a87022f90c93 100644
3737
--- a/net/minecraft/server/MinecraftServer.java
3838
+++ b/net/minecraft/server/MinecraftServer.java
39-
@@ -1744,6 +1744,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
39+
@@ -1745,6 +1745,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
4040

4141
profilerFiller.popPush("server gui refresh");
4242

@@ -46,7 +46,7 @@ index c0fa1bba36af367ea81fad4ef44dc25cb84eabd4..d6cd8ac3b44b170b5bb3a530deb40639
4646
this.tickables.get(i).run();
4747
}
4848
diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
49-
index 08c59d603fca038fc2dde36384eea1b6c971e659..2dd95aca955f19ce48be35b1ca9bcc94c3a1984d 100644
49+
index f02800e4e941b05bde6f0d5fac76e2b6ec5b9832..7a7090a2a7b41762d94cebf847cc6a795c9bc862 100644
5050
--- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
5151
+++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
5252
@@ -57,6 +57,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack

‎leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ index 41005f6b9f53a9c1125ad5e08538d9f5aacb3571..3e9b8c5fb2157f767de8bddc3e767512
3030
private DisconnectionDetails disconnectionDetails;
3131
private boolean encrypted;
3232
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
33-
index d6cd8ac3b44b170b5bb3a530deb406396d0fb7ae..367882c1cad3fd75c038931a1ecca729db27d0e5 100644
33+
index eb6d5e82b6a2576af14c0c080a05a87022f90c93..5c49816db8241694eed640a34c056effbf382934 100644
3434
--- a/net/minecraft/server/MinecraftServer.java
3535
+++ b/net/minecraft/server/MinecraftServer.java
3636
@@ -304,6 +304,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -50,7 +50,7 @@ index d6cd8ac3b44b170b5bb3a530deb406396d0fb7ae..367882c1cad3fd75c038931a1ecca729
5050
// CraftBukkit start
5151
if (this.server != null) {
5252
this.server.spark.disable(); // Paper - spark
53-
@@ -1492,7 +1495,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
53+
@@ -1493,7 +1496,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
5454
int i = this.pauseWhileEmptySeconds() * 20;
5555
this.removeDisabledPluginsBlockingSleep(); // Paper - API to allow/disallow tick sleeping
5656
if (i > 0) {
@@ -59,15 +59,15 @@ index d6cd8ac3b44b170b5bb3a530deb406396d0fb7ae..367882c1cad3fd75c038931a1ecca729
5959
this.emptyTicks++;
6060
} else {
6161
this.emptyTicks = 0;
62-
@@ -1762,6 +1765,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
62+
@@ -1763,6 +1766,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
6363

6464
public void tickConnection() {
6565
this.getConnection().tick();
6666
+ this.botList.networkTick(); // Leaves - fakeplayer
6767
}
6868

6969
private void synchronizeTime(ServerLevel level) {
70-
@@ -2814,6 +2818,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
70+
@@ -2815,6 +2819,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
7171
return 0;
7272
}
7373

@@ -472,7 +472,7 @@ index f9e7532f86122a379692561a639a209a126e8bba..2412f46837e967694222730e68e7d25a
472472

473473
for (WaypointTransmitter waypointTransmitter : this.waypoints) {
474474
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
475-
index 61530843a32632f54f3d4ad913e649ee2dca3f38..d5051d8a2b0af5d8b63a0d10987c0a7ee7114ff0 100644
475+
index 541bd2361b094f04dc2705979204930c564f8323..05730869d237439d3988635d4c8b048a7b654ca7 100644
476476
--- a/net/minecraft/world/entity/Entity.java
477477
+++ b/net/minecraft/world/entity/Entity.java
478478
@@ -1173,7 +1173,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

‎leaves-server/minecraft-patches/features/0019-Config-to-disable-method-profiler.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler
66
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
77

88
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
9-
index feb5fc93498a5ed89e3bcb61cd72ba6e75881358..6539574b72dcb362d8d106a68d6e2d968340fc5e 100644
9+
index 5c49816db8241694eed640a34c056effbf382934..af5fde7121211887672045c00aa404e2f68c43c1 100644
1010
--- a/net/minecraft/server/MinecraftServer.java
1111
+++ b/net/minecraft/server/MinecraftServer.java
12-
@@ -1248,7 +1248,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
12+
@@ -1249,7 +1249,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
1313
lastTick = currentTime;
1414
this.nextTickTimeNanos += l;
1515

‎leaves-server/minecraft-patches/features/0038-Catch-update-suppression-crash.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ index 4535858701b2bb232b9d2feb2af6551526232ddc..03e70445dfe14c119284f7c301127075
3030
throw makeReportedException(var4, packet, processor);
3131
}
3232
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
33-
index 3aa719636ea2b68463a7f412a9cbd5bf3a7925a7..498102c2553f12badff29bed98ce30528162e536 100644
33+
index 4cc0bb9c612986934bf44f933aa402b3787394ba..2545c7ebbe4bab45ea22d3843d42c7e55941387e 100644
3434
--- a/net/minecraft/server/MinecraftServer.java
3535
+++ b/net/minecraft/server/MinecraftServer.java
36-
@@ -1725,7 +1725,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
36+
@@ -1726,7 +1726,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
3737

3838
try {
3939
serverLevel.tick(hasTimeLeft);
@@ -84,7 +84,7 @@ index 895cee538086e0494eb0f57c6e6b32ccd43e72e7..e355939e153c05f9434482c471374375
8484
CrashReport crashReport = CrashReport.forThrowable(var4, "Ticking player");
8585
CrashReportCategory crashReportCategory = crashReport.addCategory("Player being ticked");
8686
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
87-
index e6457e07e7e8e7690d160020b92fbc6874c1ec82..f8e0275ebac65edfca3e8bb5d53001becd9a963f 100644
87+
index d06e5719e62b500432bb6fcb60d6049b8379c17d..df01a171a8073b6a7ef16248bd09b4c902227887 100644
8888
--- a/net/minecraft/world/entity/Entity.java
8989
+++ b/net/minecraft/world/entity/Entity.java
9090
@@ -1351,9 +1351,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

‎leaves-server/minecraft-patches/features/0039-Bedrock-break-list.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Bedrock break list
55

66

77
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
8-
index 498102c2553f12badff29bed98ce30528162e536..5e1a8ce2e772427fd8fc2b6794575e36d5c7d655 100644
8+
index 2545c7ebbe4bab45ea22d3843d42c7e55941387e..cbc9f4fbad0a88bc324111a7ce80c2880ed1d3be 100644
99
--- a/net/minecraft/server/MinecraftServer.java
1010
+++ b/net/minecraft/server/MinecraftServer.java
11-
@@ -1757,6 +1757,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
11+
@@ -1758,6 +1758,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
1212
profilerFiller.popPush("server gui refresh");
1313

1414
org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(tickCount); // Leaves - protocol

‎leaves-server/minecraft-patches/features/0072-Replay-Mod-API.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ index 514f8fbdeb776087608665c35de95294aadf5cf0..b75772897cabc3e7c59301d451685378
8080
players.add(serverPlayer1);
8181
if (players.size() >= resultLimit) {
8282
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
83-
index 5e1a8ce2e772427fd8fc2b6794575e36d5c7d655..1241b008d66bacd8640302a6dbf52a2e592b29b9 100644
83+
index cbc9f4fbad0a88bc324111a7ce80c2880ed1d3be..64b2a52ec6c4df487a9bb8ed540a429adbb6f10f 100644
8484
--- a/net/minecraft/server/MinecraftServer.java
8585
+++ b/net/minecraft/server/MinecraftServer.java
86-
@@ -1638,7 +1638,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
86+
@@ -1639,7 +1639,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
8787
}
8888

8989
private ServerStatus.Players buildPlayerStatus() {
@@ -92,7 +92,7 @@ index 5e1a8ce2e772427fd8fc2b6794575e36d5c7d655..1241b008d66bacd8640302a6dbf52a2e
9292
int maxPlayers = this.getMaxPlayers();
9393
if (this.hidesOnlinePlayers()) {
9494
return new ServerStatus.Players(maxPlayers, players.size(), List.of());
95-
@@ -1857,7 +1857,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
95+
@@ -1858,7 +1858,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
9696

9797
@Override
9898
public int getPlayerCount() {
@@ -101,7 +101,7 @@ index 5e1a8ce2e772427fd8fc2b6794575e36d5c7d655..1241b008d66bacd8640302a6dbf52a2e
101101
}
102102

103103
@Override
104-
@@ -2251,7 +2251,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
104+
@@ -2252,7 +2252,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
105105
if (Thread.currentThread() != this.serverThread) return; // Paper
106106
// Paper start - we don't need to save everything, just advancements
107107
// this.getPlayerList().saveAll();
@@ -110,7 +110,7 @@ index 5e1a8ce2e772427fd8fc2b6794575e36d5c7d655..1241b008d66bacd8640302a6dbf52a2e
110110
player.getAdvancements().save();
111111
}
112112
// Paper end - we don't need to save everything, just advancements
113-
@@ -2390,7 +2390,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
113+
@@ -2391,7 +2391,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
114114
if (!playerList.isUsingWhitelist()) return; // Paper - whitelist not enabled
115115
UserWhiteList whiteList = playerList.getWhiteList();
116116

‎leaves-server/minecraft-patches/features/0136-Lithium-Sleeping-Block-Entity.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ index 86cac164a2bf0e76528396e6aabbfd64cfc29559..da99b4bc7fe8460945070915073be141
111111

112112
int getContainerSize();
113113
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
114-
index 6b56178967872923be58983ce8b14102ec0c3e14..7a85d94f333b6e1def5926b5b7727c22da0a203f 100644
114+
index b1b0e2b4deb5830660961cfff4669c4fd7037663..4748bd188f8860ed2a8b2e6123e020c1da17af5f 100644
115115
--- a/net/minecraft/world/entity/Entity.java
116116
+++ b/net/minecraft/world/entity/Entity.java
117117
@@ -309,7 +309,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
118118
private static final EntityDataAccessor<Boolean> DATA_NO_GRAVITY = SynchedEntityData.defineId(Entity.class, EntityDataSerializers.BOOLEAN);
119119
protected static final EntityDataAccessor<Pose> DATA_POSE = SynchedEntityData.defineId(Entity.class, EntityDataSerializers.POSE);
120-
private static final EntityDataAccessor<Integer> DATA_TICKS_FROZEN = SynchedEntityData.defineId(Entity.class, EntityDataSerializers.INT);
120+
public static final EntityDataAccessor<Integer> DATA_TICKS_FROZEN = SynchedEntityData.defineId(Entity.class, EntityDataSerializers.INT);
121121
- private EntityInLevelCallback levelCallback = EntityInLevelCallback.NULL;
122122
+ public EntityInLevelCallback levelCallback = EntityInLevelCallback.NULL; // Leaves - private -> public
123123
private final VecDeltaCodec packetPositionCodec = new VecDeltaCodec();

‎leaves-server/minecraft-patches/features/0141-Modify-end-void-rings-generation.patch‎ renamed to ‎leaves-server/minecraft-patches/features/0139-Modify-end-void-rings-generation.patch‎

File renamed without changes.

0 commit comments

Comments
 (0)