9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-04 15:41:31 +00:00

Update 1.19.4

This commit is contained in:
violetc
2023-03-19 17:30:46 +08:00
parent 2fe291360d
commit c67a637939
48 changed files with 342 additions and 376 deletions

View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Player operation limiter
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 2e5871d9af67ad1c65a382f5e4964a13a7821305..128a79504e2459826dbc32b5889f66bf00ea4189 100644
index a11b8b93ba9248ea463b7a3a3dcfdcf1c17baffb..86c4c4b866bd8378a628daebd51b80713246f223 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -269,6 +269,10 @@ public class ServerPlayer extends Player {
@@ -275,6 +275,10 @@ public class ServerPlayer extends Player {
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
@@ -20,7 +20,7 @@ index 2e5871d9af67ad1c65a382f5e4964a13a7821305..128a79504e2459826dbc32b5889f66bf
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
@@ -661,6 +665,7 @@ public class ServerPlayer extends Player {
@@ -667,6 +671,7 @@ public class ServerPlayer extends Player {
this.joining = false;
}
// CraftBukkit end
@@ -28,7 +28,7 @@ index 2e5871d9af67ad1c65a382f5e4964a13a7821305..128a79504e2459826dbc32b5889f66bf
this.gameMode.tick();
this.wardenSpawnTracker.tick();
--this.spawnInvulnerableTime;
@@ -2555,5 +2560,32 @@ public class ServerPlayer extends Player {
@@ -2547,5 +2552,32 @@ public class ServerPlayer extends Player {
public CraftPlayer getBukkitEntity() {
return (CraftPlayer) super.getBukkitEntity();
}
@@ -62,7 +62,7 @@ index 2e5871d9af67ad1c65a382f5e4964a13a7821305..128a79504e2459826dbc32b5889f66bf
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index 58b093bb1de78ee3b3b2ea364aa50474883f443a..a59cf7c1a34ee54b3a64047498ce4e090648df86 100644
index 0a3eb5e929c605d9eb7369de8ade8b49951f5d37..76928f9f5be525edce8aaf90eeaa91e367ae5ea8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -44,6 +44,7 @@ import org.bukkit.event.Event;