diff --git a/gradle.properties b/gradle.properties index 01dc941c..8b03686f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ version=1.19.4-R0.1-SNAPSHOT mcVersion=1.19.4 packageVersion=1_19_R3 org.gradle.jvmargs=-Xmx2G -paperRef=e8b82590d0c3dd57ac1728b236117d2fcd531c4f -preVersion=true +paperRef=fbf74ba0ac016c408bbec28e7da317b68a81e2e1 +preVersion=false diff --git a/patches/server/0002-Leaves-Server-Utils.patch b/patches/server/0002-Leaves-Server-Utils.patch index ce277b73..5ecd8b08 100644 --- a/patches/server/0002-Leaves-Server-Utils.patch +++ b/patches/server/0002-Leaves-Server-Utils.patch @@ -31,7 +31,7 @@ index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279 public PlayerAreaMap() { super(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9a1e8589e6b371869b2199650172d61ae186c907..fc79183a6bd979d98d79e88422801f9bb2646ea6 100644 +index 4705d7066207250c03a5f98eef61554c901f2e35..48093cbb9606c23d53a6a37d8d72190caa199d1a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -399,6 +399,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -62,7 +62,7 @@ index 9a1e8589e6b371869b2199650172d61ae186c907..fc79183a6bd979d98d79e88422801f9b } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT"); -@@ -4631,4 +4638,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4637,4 +4644,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this); } // Paper end diff --git a/patches/server/0009-Fakeplayer-support.patch b/patches/server/0009-Fakeplayer-support.patch index 71f04875..faafa05e 100644 --- a/patches/server/0009-Fakeplayer-support.patch +++ b/patches/server/0009-Fakeplayer-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fakeplayer support diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 48d4b8dc0396dc7f9142fcef35e8ecbdea5f1223..ad9c90b359874ee2c9a94c5b2cf72a634e8b56f4 100644 +index 72d113dd950e23614ba42d480125ce323b42bd9c..f31624f8c4ed5c8802c1fe1aa2fb07c1e99a1d97 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -126,6 +126,7 @@ import net.minecraft.util.profiling.metrics.profiling.ServerMetricsSamplersProvi @@ -61,18 +61,18 @@ index 26888ebd38280de92e41dd8006d2b24e874afe26..a1ce0cce055ad5c92b0f20760471795f AdvancementProgress advancementprogress = this.getOrStartProgress(advancement); boolean flag1 = advancementprogress.isDone(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ca5291a9573a62cb5c19539cf5c7aceff11f9829..a11b8b93ba9248ea463b7a3a3dcfdcf1c17baffb 100644 +index 1d4d02f26391ac55c7631817f09d05e2769b0d29..0043261e4fc1c7de6281b9b150f71aa9c2494aa1 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -182,6 +182,7 @@ import org.bukkit.event.player.PlayerPortalEvent; - import org.bukkit.event.player.PlayerTeleportEvent; +@@ -183,6 +183,7 @@ import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; + import org.bukkit.event.player.PlayerToggleSneakEvent; import org.bukkit.inventory.MainHand; +import top.leavesmc.leaves.bot.ServerBot; // CraftBukkit end public class ServerPlayer extends Player { -@@ -1221,6 +1222,13 @@ public class ServerPlayer extends Player { +@@ -1222,6 +1223,13 @@ public class ServerPlayer extends Player { this.lastSentHealth = -1.0F; this.lastSentFood = -1; @@ -169,10 +169,10 @@ index c0c14766adaac855112f85a203a6163b8adfdded..ae761e2e5980ec484203ce7205946393 + // Leaves end - fakeplayer support } diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 2b02800666b358159c8ecb63208a14855f90657b..3b119f016cee353412fa84415e189453e9371b2c 100644 +index 0629c471d38a77c44fc1c86ccdfcb0690f61ca17..3476b51ded6488ef54dc5c10bdb4b48a37a2431a 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1282,7 +1282,7 @@ public abstract class Player extends LivingEntity { +@@ -1288,7 +1288,7 @@ public abstract class Player extends LivingEntity { boolean flag3 = false; double d0 = (double) (this.walkDist - this.walkDistO); diff --git a/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch index d0badfc8..6a8655b2 100644 --- a/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch +++ b/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 06709144f1cd70889e358e4e4a0b0c3a92ac0f7d..3229d81fa7e30f47a7bbee2be109b9d69d973dfb 100644 +index cf1694ada40fab9e06f702bcf6bf3a6a07b2cee3..f0b113a4da3e5f6f064e5daa50ac9171d4563078 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4162,16 +4162,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4168,16 +4168,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean updateFluidHeightAndDoFluidPushing(TagKey tag, double speed) { @@ -35,7 +35,7 @@ index 06709144f1cd70889e358e4e4a0b0c3a92ac0f7d..3229d81fa7e30f47a7bbee2be109b9d6 double d1 = 0.0D; boolean flag = this.isPushedByFluid(); boolean flag1 = false; -@@ -4179,38 +4181,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4185,38 +4187,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { int k1 = 0; BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(); diff --git a/patches/server/0051-Player-operation-limiter.patch b/patches/server/0051-Player-operation-limiter.patch index b0b9e4be..c4f623bc 100644 --- a/patches/server/0051-Player-operation-limiter.patch +++ b/patches/server/0051-Player-operation-limiter.patch @@ -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 a11b8b93ba9248ea463b7a3a3dcfdcf1c17baffb..86c4c4b866bd8378a628daebd51b80713246f223 100644 +index 0043261e4fc1c7de6281b9b150f71aa9c2494aa1..741ec2c1be0661f503e246d1c16b3ac97b1fa2e4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -275,6 +275,10 @@ public class ServerPlayer extends Player { +@@ -276,6 +276,10 @@ public class ServerPlayer extends Player { public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet 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 a11b8b93ba9248ea463b7a3a3dcfdcf1c17baffb..86c4c4b866bd8378a628daebd51b8071 public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) { super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); -@@ -667,6 +671,7 @@ public class ServerPlayer extends Player { +@@ -668,6 +672,7 @@ public class ServerPlayer extends Player { this.joining = false; } // CraftBukkit end @@ -28,7 +28,7 @@ index a11b8b93ba9248ea463b7a3a3dcfdcf1c17baffb..86c4c4b866bd8378a628daebd51b8071 this.gameMode.tick(); this.wardenSpawnTracker.tick(); --this.spawnInvulnerableTime; -@@ -2547,5 +2552,32 @@ public class ServerPlayer extends Player { +@@ -2558,5 +2563,32 @@ public class ServerPlayer extends Player { public CraftPlayer getBukkitEntity() { return (CraftPlayer) super.getBukkitEntity(); } @@ -62,7 +62,7 @@ index a11b8b93ba9248ea463b7a3a3dcfdcf1c17baffb..86c4c4b866bd8378a628daebd51b8071 // 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 0a3eb5e929c605d9eb7369de8ade8b49951f5d37..76928f9f5be525edce8aaf90eeaa91e367ae5ea8 100644 +index 1d33c02088c150189d7f4b0aa27f6a1de96b11cf..1d3b2a017b2fcabb1e19fcac7856d051932124ba 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; @@ -73,7 +73,7 @@ index 0a3eb5e929c605d9eb7369de8ade8b49951f5d37..76928f9f5be525edce8aaf90eeaa91e3 // CraftBukkit end public class ServerPlayerGameMode { -@@ -325,6 +326,19 @@ public class ServerPlayerGameMode { +@@ -333,6 +334,19 @@ public class ServerPlayerGameMode { } public void destroyAndAck(BlockPos pos, int sequence, String reason) { diff --git a/patches/server/0056-Return-nether-portal-fix.patch b/patches/server/0056-Return-nether-portal-fix.patch index ebc73eba..9b146d18 100644 --- a/patches/server/0056-Return-nether-portal-fix.patch +++ b/patches/server/0056-Return-nether-portal-fix.patch @@ -6,18 +6,18 @@ Subject: [PATCH] Return nether portal fix This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix) diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 86c4c4b866bd8378a628daebd51b80713246f223..b9ac3537afde153f7268362c6360c6e7576e05d2 100644 +index 741ec2c1be0661f503e246d1c16b3ac97b1fa2e4..9c4df8ba64afd52cf9e0c9be5016c0d00e566b72 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -183,6 +183,7 @@ import org.bukkit.event.player.PlayerTeleportEvent; - import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +@@ -184,6 +184,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; + import org.bukkit.event.player.PlayerToggleSneakEvent; import org.bukkit.inventory.MainHand; import top.leavesmc.leaves.bot.ServerBot; +import top.leavesmc.leaves.util.ReturnPortalManager; // CraftBukkit end public class ServerPlayer extends Player { -@@ -1238,6 +1239,24 @@ public class ServerPlayer extends Player { +@@ -1239,6 +1240,24 @@ public class ServerPlayer extends Player { PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld()); this.level.getCraftServer().getPluginManager().callEvent(changeEvent); // CraftBukkit end @@ -42,7 +42,7 @@ index 86c4c4b866bd8378a628daebd51b80713246f223..b9ac3537afde153f7268362c6360c6e7 } // Paper start if (this.isBlocking()) { -@@ -1290,6 +1309,30 @@ public class ServerPlayer extends Player { +@@ -1291,6 +1310,30 @@ public class ServerPlayer extends Player { protected Optional getExitPortal(ServerLevel worldserver, BlockPos blockposition, boolean flag, WorldBorder worldborder, int searchRadius, boolean canCreatePortal, int createRadius) { // CraftBukkit Optional optional = super.getExitPortal(worldserver, blockposition, flag, worldborder, searchRadius, canCreatePortal, createRadius); // CraftBukkit @@ -74,7 +74,7 @@ index 86c4c4b866bd8378a628daebd51b80713246f223..b9ac3537afde153f7268362c6360c6e7 return optional; } else { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 6803f21f43da5a5254622d61eba4ab8ddbe25344..93ef11d92952c7d58410c5d9737900d464dddf84 100644 +index ecc44d115bffcf37284cee0ebd37610d0567581f..6ee9356820c052eb80d05d270c9199e74fb7b6be 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -27,6 +27,8 @@ import java.util.UUID; @@ -120,7 +120,7 @@ index 6803f21f43da5a5254622d61eba4ab8ddbe25344..93ef11d92952c7d58410c5d9737900d4 // Save player file again if they were disconnected diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 454495e3e1d432553762f36c18ec290fe13425c0..fc0efe4547089f709fcbf65f8eabc1b88854fb0e 100644 +index 557a92bfaecf3f1bddd4c602a26a7d5373f9798d..3a4f0545ac7cf054ad996ffb574265045f227c07 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -240,7 +240,7 @@ public abstract class LivingEntity extends Entity implements Attackable {