diff --git a/gale-server/minecraft-patches/features/0004-Remove-vanilla-profiler.patch b/gale-server/minecraft-patches/features/0004-Remove-vanilla-profiler.patch index 6214101..6f30374 100644 --- a/gale-server/minecraft-patches/features/0004-Remove-vanilla-profiler.patch +++ b/gale-server/minecraft-patches/features/0004-Remove-vanilla-profiler.patch @@ -1068,7 +1068,7 @@ index 3fe8ae3b49163f1b124562165dbb27ab96a6eb05..ae89315cb35a55d0dd0e36db35cba467 for (Entity entity : passengerEntity.getPassengers()) { this.tickPassenger(passengerEntity, entity, isActive); // Paper - EAR 2 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index f347ff8d863f4bcef46604c757de112cb3fe445c..b349da64650f914db8212e19b3c05ba92e74a1a3 100644 +index 57d432dc9e8d8e9a3e088e7c40b35178c30fe786..dff1e84584c66045c58f0a6fe8102a27a54716a6 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -96,8 +96,6 @@ import net.minecraft.tags.FluidTags; @@ -1222,7 +1222,7 @@ index 64b0508ef21952c65b0b967b756b2a4c64d96899..b6b03fbbd669e6331b30255df5419611 protected abstract T prepare(ResourceManager resourceManager, ProfilerFiller profiler); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd2206401352c862 100644 +index bd5b7f9290a6af32afdd9b4a46d612157075543c..df0d7a7f54b20226ad84f8e6673d88d6fe10953b 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -78,8 +78,6 @@ import net.minecraft.tags.FluidTags; @@ -1234,7 +1234,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.Nameable; -@@ -829,8 +827,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -825,8 +823,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess // CraftBukkit end public void baseTick() { @@ -1243,7 +1243,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Prevent entity loading causing async lookups this.inBlockState = null; if (this.isPassenger() && this.getVehicle().isRemoved()) { -@@ -893,8 +889,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -889,8 +885,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess if (this.level() instanceof ServerLevel serverLevelx && this instanceof Leashable) { Leashable.tickLeash(serverLevelx, (Entity & Leashable)this); } @@ -1252,7 +1252,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 } public void setSharedFlagOnFire(boolean isOnFire) { -@@ -1112,8 +1106,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1108,8 +1102,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } } @@ -1261,7 +1261,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7) { movement = movement.multiply(this.stuckSpeedMultiplier); this.stuckSpeedMultiplier = Vec3.ZERO; -@@ -1122,7 +1114,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1118,7 +1110,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess // Paper start - ignore movement changes while inactive. if (isTemporarilyActive && !(this instanceof ItemEntity) && movement == getDeltaMovement() && type == MoverType.SELF) { setDeltaMovement(Vec3.ZERO); @@ -1269,7 +1269,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 return; } // Paper end -@@ -1144,8 +1135,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1140,8 +1131,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.setPos(this.getX() + vec3.x, this.getY() + vec3.y, this.getZ() + vec3.z); } @@ -1278,7 +1278,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 boolean flag = !Mth.equal(movement.x, vec3.x); boolean flag1 = !Mth.equal(movement.z, vec3.z); this.horizontalCollision = flag || flag1; -@@ -1168,7 +1157,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1164,7 +1153,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } if (this.isRemoved()) { @@ -1286,7 +1286,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 } else { if (this.horizontalCollision) { Vec3 deltaMovement = this.getDeltaMovement(); -@@ -1213,7 +1201,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1209,7 +1197,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess float blockSpeedFactor = this.getBlockSpeedFactor(); this.setDeltaMovement(this.getDeltaMovement().multiply(blockSpeedFactor, 1.0, blockSpeedFactor)); @@ -1294,7 +1294,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 } } // Paper start - detailed watchdog information -@@ -3263,8 +3250,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3259,8 +3246,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.processPortalCooldown(); if (this.portalProcess != null) { if (this.portalProcess.processPortalTeleportation(serverLevel, this, this.canUsePortal(false))) { @@ -1303,7 +1303,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 this.setPortalCooldown(); TeleportTransition portalDestination = this.portalProcess.getPortalDestination(serverLevel, this); if (portalDestination != null) { -@@ -3275,7 +3260,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3271,7 +3256,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } } @@ -1311,7 +1311,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 } else if (this.portalProcess.hasExpired()) { this.portalProcess = null; } -@@ -3795,15 +3779,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3791,15 +3775,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess entity.teleport(this.calculatePassengerTransition(teleportTransition, entity)); } @@ -1327,7 +1327,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 return this; } -@@ -3819,11 +3800,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3815,11 +3796,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } } @@ -1339,7 +1339,7 @@ index 525210788937af70f9a0df1c66e0064d20552c1b..386291cf55f6a36e813719abbd220640 return null; } else { // Paper start - Fix item duplication and teleport issues -@@ -3846,7 +3824,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3842,7 +3820,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess level.resetEmptyTime(); teleportTransition.postTeleportTransition().onTransition(entityx); @@ -2057,7 +2057,7 @@ index 2b83262e4a13eae86df82913ce4f3121e3631a43..ee7b4080a9e1e51273f4b48f61caaa21 this.assignProfessionWhenSpawned = false; } diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index b9c930210f750aa9594d3acae584a8d11983a210..73678ed00529af2369c66900c948de5fb46cc128 100644 +index e993323e4010c6c07cfeade4b16970d66890941e..052d74ff170f0f6ab7acac763a4a7c3384baadad 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java @@ -35,8 +35,6 @@ import net.minecraft.util.AbortableIterationConsumer; diff --git a/gale-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch b/gale-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch index ad5782f..b2d26ba 100644 --- a/gale-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch +++ b/gale-server/minecraft-patches/features/0048-Optimize-sun-burn-tick.patch @@ -13,10 +13,10 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index df972d47848f9cb74be269019b196c4f2699bfc1..c08a7a2d12fbf67dc675f79e8452b90b99eca86b 100644 +index 1f13fb8ad11e2e072ac149510d009e2e19dca27d..720b4828bd201a506a454ec76a57ae039631cfad 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -2024,10 +2024,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2020,10 +2020,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @Deprecated public float getLightLevelDependentMagicValue() { diff --git a/gale-server/minecraft-patches/features/0064-Skip-entity-move-if-movement-is-zero.patch b/gale-server/minecraft-patches/features/0064-Skip-entity-move-if-movement-is-zero.patch index 671bc38..cdf94e7 100644 --- a/gale-server/minecraft-patches/features/0064-Skip-entity-move-if-movement-is-zero.patch +++ b/gale-server/minecraft-patches/features/0064-Skip-entity-move-if-movement-is-zero.patch @@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index c08a7a2d12fbf67dc675f79e8452b90b99eca86b..61c929cb391c122095edc0d655f095a487cfce75 100644 +index 720b4828bd201a506a454ec76a57ae039631cfad..673c7e999f6aa5b52ccc2ca8a9026dfb680bebab 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -233,6 +233,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -24,7 +24,7 @@ index c08a7a2d12fbf67dc675f79e8452b90b99eca86b..61c929cb391c122095edc0d655f095a4 public boolean onGround; public boolean horizontalCollision; public boolean verticalCollision; -@@ -1083,6 +1084,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1079,6 +1080,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess // Paper end - detailed watchdog information public void move(MoverType type, Vec3 movement) { @@ -36,7 +36,7 @@ index c08a7a2d12fbf67dc675f79e8452b90b99eca86b..61c929cb391c122095edc0d655f095a4 final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity // Paper start - detailed watchdog information ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main"); -@@ -4174,6 +4180,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4170,6 +4176,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public final void setBoundingBox(AABB bb) { diff --git a/gale-server/minecraft-patches/features/0069-Hide-flames-on-entities-with-fire-resistance.patch b/gale-server/minecraft-patches/features/0069-Hide-flames-on-entities-with-fire-resistance.patch index af7b16f..3cdb78d 100644 --- a/gale-server/minecraft-patches/features/0069-Hide-flames-on-entities-with-fire-resistance.patch +++ b/gale-server/minecraft-patches/features/0069-Hide-flames-on-entities-with-fire-resistance.patch @@ -13,10 +13,10 @@ As part of: Slice (https://github.com/Cryptite/Slice) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 61c929cb391c122095edc0d655f095a487cfce75..bbcfb7b535514d8e394b31f74d2bbc2ba90e7498 100644 +index 673c7e999f6aa5b52ccc2ca8a9026dfb680bebab..300626778dd9b21c421014e14f72fda82e06ee8e 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -884,7 +884,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -880,7 +880,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess this.checkBelowWorld(); if (!this.level().isClientSide) { diff --git a/gale-server/minecraft-patches/features/0078-Don-t-load-chunks-to-activate-climbing-entities.patch b/gale-server/minecraft-patches/features/0078-Don-t-load-chunks-to-activate-climbing-entities.patch index 3f97e72..3abc4a7 100644 --- a/gale-server/minecraft-patches/features/0078-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/gale-server/minecraft-patches/features/0078-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index bbcfb7b535514d8e394b31f74d2bbc2ba90e7498..55c05f5e8e5045292f77621fed78a0498c9b53bf 100644 +index 300626778dd9b21c421014e14f72fda82e06ee8e..cd0994cb656342b0cb8f27c4360310502b480552 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -4679,6 +4679,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4675,6 +4675,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess return this.inBlockState; } diff --git a/gale-server/minecraft-patches/features/0088-For-collision-check-has-physics-before-same-vehicle.patch b/gale-server/minecraft-patches/features/0088-For-collision-check-has-physics-before-same-vehicle.patch index 86b9f9a..9bf75f1 100644 --- a/gale-server/minecraft-patches/features/0088-For-collision-check-has-physics-before-same-vehicle.patch +++ b/gale-server/minecraft-patches/features/0088-For-collision-check-has-physics-before-same-vehicle.patch @@ -16,10 +16,10 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 55c05f5e8e5045292f77621fed78a0498c9b53bf..295dc5f9f7d8765d345e1c543c7ffea5baaf3cfc 100644 +index cd0994cb656342b0cb8f27c4360310502b480552..553cd23db3305071923ca015f02f40f357cb729b 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -2168,8 +2168,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2164,8 +2164,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public void push(Entity entity) { diff --git a/gale-server/minecraft-patches/features/0089-Skip-negligible-planar-movement-multiplication.patch b/gale-server/minecraft-patches/features/0089-Skip-negligible-planar-movement-multiplication.patch index 15c1b8d..1e4a6c3 100644 --- a/gale-server/minecraft-patches/features/0089-Skip-negligible-planar-movement-multiplication.patch +++ b/gale-server/minecraft-patches/features/0089-Skip-negligible-planar-movement-multiplication.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 295dc5f9f7d8765d345e1c543c7ffea5baaf3cfc..7cbeb351d40245a159bacc8cc089957a95d095e9 100644 +index 553cd23db3305071923ca015f02f40f357cb729b..263907a23277a520f55100768afc02685975758d 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -1212,8 +1212,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1208,8 +1208,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } } diff --git a/gradle.properties b/gradle.properties index 7984194..cb01a2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -paperRef=1004374a83efcc730876d41b80288359c993ae0e +paperRef=54b2e9d9738ce32e2f415c321f20e3fc07063c14 org.gradle.configuration-cache=true org.gradle.caching=true