diff --git a/gradle.properties b/gradle.properties index 231c3cce..5f35ce17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ version=1.19.3-R0.1-SNAPSHOT mcVersion=1.19.3 packageVersion=1_19_R2 org.gradle.jvmargs=-Xmx2G -paperRef=7b52db5f612ff0aca575760e79fd24be96b10fdd +paperRef=f26e9ccdd0d08d765f96a32d1d124f0f6b9bb3a2 diff --git a/patches/server/0005-Fix-gravity-block-duper.patch b/patches/server/0005-Fix-gravity-block-duper.patch index 63b655f9..1dc5d27d 100644 --- a/patches/server/0005-Fix-gravity-block-duper.patch +++ b/patches/server/0005-Fix-gravity-block-duper.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix gravity block duper diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7f94da8059147760cbdc2476d0e8beda4a105f40..9b3dda86d8094fa221f3cf88ef99b88b0edd105e 100644 +index 7555b04dcf274bb624b89f2eb9ff80da0056de4e..6c7a3432eed5a6dea56bf414d7d6ce1aff3acda7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -510,36 +510,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -511,36 +511,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this)); } // Paper end - optimise entity tracking @@ -46,7 +46,7 @@ index 7f94da8059147760cbdc2476d0e8beda4a105f40..9b3dda86d8094fa221f3cf88ef99b88b public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); -@@ -2917,7 +2889,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2927,7 +2899,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } this.processPortalCooldown(); diff --git a/patches/server/0018-No-chat-sign.patch b/patches/server/0018-No-chat-sign.patch index 685c7212..4513f3b5 100644 --- a/patches/server/0018-No-chat-sign.patch +++ b/patches/server/0018-No-chat-sign.patch @@ -5,10 +5,10 @@ Subject: [PATCH] No chat sign diff --git a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java -index 0f5cf192c0848bdeadeda381e19ec035455abfe5..ed271c77b29db683e6764eac6b2f3cb174c907f6 100644 +index 309fe1162db195c7c3c94d785d6aa2700e42b08a..7f00a44fdba7ba63ea9e06ff959ff51ddfdfebf9 100644 --- a/src/main/java/io/papermc/paper/adventure/ChatProcessor.java +++ b/src/main/java/io/papermc/paper/adventure/ChatProcessor.java -@@ -351,7 +351,7 @@ public final class ChatProcessor { +@@ -352,7 +352,7 @@ public final class ChatProcessor { private void sendToServer(final ChatType.Bound chatType, final @Nullable Function msgFunction) { final PlayerChatMessage toConsoleMessage = msgFunction == null ? ChatProcessor.this.message : ChatProcessor.this.message.withUnsignedContent(msgFunction.apply(ChatProcessor.this.server.console)); diff --git a/patches/server/0035-Reduce-entity-allocations.patch b/patches/server/0035-Reduce-entity-allocations.patch index 910578e9..317279d9 100644 --- a/patches/server/0035-Reduce-entity-allocations.patch +++ b/patches/server/0035-Reduce-entity-allocations.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity allocations 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 5e0a0a578522628d440aafd63212256ef5cfc262..d20952301a4ab745ac769316cb16de3d54d17693 100644 +index b486fa2368544bfad7afc512200ba0a1c553e12b..b433f122489467feb4d7efca2462effae9ebdd7a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -413,6 +413,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -414,6 +414,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return this.originWorld; } // Paper end diff --git a/patches/server/0038-Remove-streams-from-getting-nearby-players.patch b/patches/server/0038-Remove-streams-from-getting-nearby-players.patch index 0145f6c9..94ef0731 100644 --- a/patches/server/0038-Remove-streams-from-getting-nearby-players.patch +++ b/patches/server/0038-Remove-streams-from-getting-nearby-players.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Remove streams from getting nearby players 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 2d8af400a75324b57bae87ceaee79e74da180cbd..5e85ecd3fc64f92e3ca65d127930ff195cd0949c 100644 +index b433f122489467feb4d7efca2462effae9ebdd7a..a629ba230cd5824401a1854ab46a07f64466bacf 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -489,25 +489,50 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -490,25 +490,50 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.isLegacyTrackingEntity = isLegacyTrackingEntity; } diff --git a/patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch index 1b765608..bb5aec3f 100644 --- a/patches/server/0043-Reduce-entity-fluid-lookups-if-no-fluids.patch +++ b/patches/server/0043-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 c6721ecf41c0c0b9b0636bffe81002e37e083c16..8c8bd0ec9ce63b2f5b089b328dbc72be4c9949a7 100644 +index a629ba230cd5824401a1854ab46a07f64466bacf..1be77824bd60c3eeeb748157f3fe2efb9051d9a4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4081,16 +4081,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4091,16 +4091,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean updateFluidHeightAndDoFluidPushing(TagKey tag, double speed) { @@ -35,7 +35,7 @@ index c6721ecf41c0c0b9b0636bffe81002e37e083c16..8c8bd0ec9ce63b2f5b089b328dbc72be double d1 = 0.0D; boolean flag = this.isPushedByFluid(); boolean flag1 = false; -@@ -4098,38 +4100,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4108,38 +4110,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { int k1 = 0; BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(); diff --git a/patches/server/0050-Jade-Protocol.patch b/patches/server/0050-Jade-Protocol.patch index 9c6386f9..2aa19b13 100644 --- a/patches/server/0050-Jade-Protocol.patch +++ b/patches/server/0050-Jade-Protocol.patch @@ -32,10 +32,10 @@ index 24e33c12d04ff13283f442e75c5124a62854ce01..0e04c1e14d6e3b1dfffa9e1bde563bf8 final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage(); diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java -index e8574bd4b412c1db82aaec9dced47b63de9dbf28..066b0dbbb6d4d6f4526bd1f622162ffe582ad369 100644 +index 9058f9f2e561cda9f475f33218bf7a78297de4bc..196adc124a06e7c7712e4f70fada6d50a4a56d17 100644 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java -@@ -247,7 +247,7 @@ public class Tadpole extends AbstractFish { +@@ -253,7 +253,7 @@ public class Tadpole extends AbstractFish { }