mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
feat: update paper
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
group=org.leavesmc.leaves
|
||||
version=1.21.9-rc1-R0.1-SNAPSHOT
|
||||
mcVersion=1.21.9-rc1
|
||||
paperRef=51fe7aaaf3286400c988ef1422d99292a703cdef
|
||||
paperRef=e16b369f6e8cbd3c4cc29970b6eb11d2b9da06df
|
||||
preVersion=true
|
||||
paper.runDisableWatchdog=true
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Player operation limiter
|
||||
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
|
||||
|
||||
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
|
||||
index 87181a351a1494038c391682781e4c9e0d46a795..cda496fe531953a78c868fab96705e652ec41a99 100644
|
||||
index 96501267033fb79f2b7c55e275178f0233d261d2..86ba559fea4f8f5de4189155a27472f902726ef0 100644
|
||||
--- a/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -442,6 +442,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||
@@ -28,7 +28,7 @@ index 87181a351a1494038c391682781e4c9e0d46a795..cda496fe531953a78c868fab96705e65
|
||||
this.gameMode.tick();
|
||||
this.wardenSpawnTracker.tick();
|
||||
if (this.invulnerableTime > 0) {
|
||||
@@ -3110,4 +3115,31 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||
@@ -3112,4 +3117,31 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||
return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
|
||||
}
|
||||
// CraftBukkit end
|
||||
@@ -61,7 +61,7 @@ index 87181a351a1494038c391682781e4c9e0d46a795..cda496fe531953a78c868fab96705e65
|
||||
+ // Leaves end - player operation limiter
|
||||
}
|
||||
diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
|
||||
index 1c40e40ffb0d4d2ce523616edfb301f856f4d71e..3a1108b1e98629a7d2ade8c25a604175cedcd42e 100644
|
||||
index 6133f70e72c56d09c5f9d4a988ae8913102f99df..0bcc7e50b57c7d48c65f329ab711fe847bb0c834 100644
|
||||
--- a/net/minecraft/server/level/ServerPlayerGameMode.java
|
||||
+++ b/net/minecraft/server/level/ServerPlayerGameMode.java
|
||||
@@ -320,6 +320,19 @@ public class ServerPlayerGameMode {
|
||||
|
||||
@@ -80,7 +80,7 @@ index d438e31a082b675d7eb0eead7067a0b92363a9f9..c08f34bc17bec9f73c377b45389a7755
|
||||
players.add(serverPlayer1);
|
||||
if (players.size() >= resultLimit) {
|
||||
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
|
||||
index ee9a7b7da4b739efd8e407caecad34eba770fb50..a9936e1fabd02d0c8dd567aa8a1a16465d424d1a 100644
|
||||
index 95babe9f54e44f2c0809d95e7bd7273fcd33b379..273d537bae30ef9f79c6a1eda910b84997415a3f 100644
|
||||
--- a/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1575,7 +1575,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
@@ -109,7 +109,7 @@ index ee9a7b7da4b739efd8e407caecad34eba770fb50..a9936e1fabd02d0c8dd567aa8a1a1646
|
||||
+ for (ServerPlayer serverPlayer : this.getPlayerList().realPlayers) { // Leaves - only real player
|
||||
// Paper start - Expand PlayerGameModeChangeEvent
|
||||
org.bukkit.event.player.PlayerGameModeChangeEvent event = serverPlayer.setGameMode(gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, null);
|
||||
if (event != null && event.isCancelled()) {
|
||||
if (event == null || event.isCancelled()) {
|
||||
@@ -2199,7 +2199,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
if (Thread.currentThread() != this.serverThread) return; // Paper
|
||||
// Paper start - we don't need to save everything, just advancements
|
||||
@@ -302,7 +302,7 @@ index 980b06c70e3aa4eb2a462ebf06a4153d91e2b5dc..27606bcb957abe27641010f920deafa0
|
||||
}
|
||||
// Leaves end - skip
|
||||
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
|
||||
index 0981f5d07144f75148b035e41f82190d0cd6526a..13c6ed8e37875e1ae061cf0a55b05a7f10fa24e1 100644
|
||||
index c52a5122e969e4c25861c7cc4e3e52f555f6220c..b2f9ec8e4febb461b582d7799a3dceaa8f8c24a1 100644
|
||||
--- a/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -522,7 +522,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable packet limit
|
||||
|
||||
|
||||
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||
index 3f5e76e4df8ff8152060449f89b522910adee834..6ccf223e3ebc0f90e73924ee3ca2ccfd34b7dfe7 100644
|
||||
index 81553c3f08bfac855b914997fb6a4e7cf2241272..4d50541ebe638b22a26b23c87ffefdce4d84323c 100644
|
||||
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
|
||||
@@ -286,7 +286,7 @@ public class GlobalConfiguration extends ConfigurationPart {
|
||||
@@ -269,7 +269,7 @@ public class GlobalConfiguration extends ConfigurationPart {
|
||||
}
|
||||
|
||||
public boolean isEnabled() {
|
||||
|
||||
Reference in New Issue
Block a user