diff --git a/gradle.properties b/gradle.properties index 1b16722..e63e3bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=c0936a71bd762a5a87425a24cfb9daff7418a4d4 +paperRef=6c7e3c519364ddf6c11d70e6d61cf6a00df650e0 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0006-Player-canSee-by-entity-UUID.patch b/patches/api/0006-Player-canSee-by-entity-UUID.patch index c920bc8..82c677f 100644 --- a/patches/api/0006-Player-canSee-by-entity-UUID.patch +++ b/patches/api/0006-Player-canSee-by-entity-UUID.patch @@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index d0297f47f18cabf857cf4ce04c529b46525c0f75..d9482f6eed0b68772d33f861e43181b9453e9581 100644 +index 4f710a941954a3d94acabe2a83bee050ad1ff052..760e6f96d3c43d6ab3d4e2e147a3472724c9ec25 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -5,6 +5,8 @@ import java.net.InetSocketAddress; @@ -49,7 +49,7 @@ index d0297f47f18cabf857cf4ce04c529b46525c0f75..d9482f6eed0b68772d33f861e43181b9 import org.bukkit.BanEntry; import org.bukkit.DyeColor; import org.bukkit.Effect; -@@ -1753,6 +1755,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1775,6 +1777,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @ApiStatus.Experimental public boolean canSee(@NotNull Entity entity); diff --git a/patches/server/0017-Remove-vanilla-profiler.patch b/patches/server/0017-Remove-vanilla-profiler.patch index 9706382..8b1d397 100644 --- a/patches/server/0017-Remove-vanilla-profiler.patch +++ b/patches/server/0017-Remove-vanilla-profiler.patch @@ -498,7 +498,7 @@ index 4a610b712acfe0b1b4dcf4988bc22c6a71616050..e49e1f2afdade4dc16aa5239d60c0dcf ++j; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 9209b598d7168b82574e4800056b8b9f84265dd0..31963a0931bcd3465e46b9c875e89ac56aead62d 100644 +index 469083208110d5735e1bbda7a15c55a032d0e8cc..67d778ef115fc1e09fc8fa9c21d17613a11ca17f 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -75,7 +75,6 @@ import net.minecraft.server.level.progress.ChunkProgressListener; @@ -885,7 +885,7 @@ index 9d46536f80b5b3e6641fd377c02166a431edfd77..8badf1d6239eca7e48819860ada3a1ce this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities())); playerlist.sendLevelInfo(this, worldserver); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b777547cb9f8edf4e7b3c2cfb894f8cd1b1a35a5..27fb4833c3fb153c9af05fef8fc72421f9832958 100644 +index 316740b2ba4c85828f544249c8cdd6fa1b525d3f..27b177c3291bf2e6d7b8223bc3ea275c71fa0a49 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -395,7 +395,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -981,10 +981,10 @@ index 7ab57748b2f2aea1003d9b7e70e76c372aa1e432..47e75ec4a01f8a456ec6ebc13031c1f0 } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c3e48ee93 100644 +index 4c298406ce06d39f8279049270c88ec0830733b1..6d6dc0e5457df7ac2a7166ffd62add6655b79e5b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -810,7 +810,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -809,7 +809,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // CraftBukkit end public void baseTick() { @@ -992,7 +992,7 @@ index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking this.feetBlockState = null; if (this.isPassenger() && this.getVehicle().isRemoved()) { -@@ -871,7 +870,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -870,7 +869,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } this.firstTick = false; @@ -1000,7 +1000,7 @@ index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c } public void setSharedFlagOnFire(boolean onFire) { -@@ -1090,7 +1088,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1089,7 +1087,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } } @@ -1008,7 +1008,7 @@ index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) { movement = movement.multiply(this.stuckSpeedMultiplier); this.stuckSpeedMultiplier = Vec3.ZERO; -@@ -1099,7 +1096,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1098,7 +1095,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // Paper start - ignore movement changes while inactive. if (isTemporarilyActive && !(this instanceof ItemEntity || this instanceof net.minecraft.world.entity.vehicle.AbstractMinecart) && movement == getDeltaMovement() && movementType == MoverType.SELF) { setDeltaMovement(Vec3.ZERO); @@ -1016,7 +1016,7 @@ index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c return; } // Paper end -@@ -1120,8 +1116,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1119,8 +1115,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z); } @@ -1025,7 +1025,7 @@ index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c boolean flag = !Mth.equal(movement.x, vec3d1.x); boolean flag1 = !Mth.equal(movement.z, vec3d1.z); -@@ -1139,9 +1133,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1138,9 +1132,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { BlockState iblockdata = this.level().getBlockState(blockposition); this.checkFallDamage(vec3d1.y, this.onGround(), iblockdata, blockposition); @@ -1036,7 +1036,7 @@ index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c if (this.horizontalCollision) { Vec3 vec3d2 = this.getDeltaMovement(); -@@ -1277,8 +1269,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1276,8 +1268,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (this.isOnFire() && (this.isInPowderSnow || this.isInWaterRainOrBubble())) { this.setRemainingFireTicks(-this.getFireImmuneTicks()); } @@ -1045,7 +1045,7 @@ index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c } } // Paper start - detailed watchdog information -@@ -3029,7 +3019,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3028,7 +3018,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey); if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit @@ -1053,7 +1053,7 @@ index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c this.portalTime = i; // Paper start io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER); -@@ -3047,7 +3036,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3046,7 +3035,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } } // Paper // CraftBukkit end @@ -1061,7 +1061,7 @@ index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c } this.isInsidePortal = false; -@@ -3518,14 +3506,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3517,14 +3505,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } // Paper end if (this.level() instanceof ServerLevel && !this.isRemoved()) { @@ -1076,7 +1076,7 @@ index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit if (shapedetectorshape == null) { -@@ -3559,7 +3545,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3558,7 +3544,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.unRide(); // CraftBukkit end @@ -1084,7 +1084,7 @@ index 3ffb92a82e17af467afb18c81accc482a93d6a6f..431bc32a61934f9bf4d268df1f70194c // Paper start - Change lead drop timing to prevent dupe if (this instanceof Mob) { ((Mob) this).dropLeash(true, true); // Paper drop lead -@@ -3582,10 +3567,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3581,10 +3566,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } this.removeAfterChangingDimensions(); @@ -1609,7 +1609,7 @@ index 8f97c9df726ac20cfce7bdddd5dd4f8c5aa76c35..8f2c0dcb0ca69ea1b09bb055c6a94949 } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 71189e98dcb71e625defe5a0bd6355597c9382e6..65258190f550a0a2653fc975430d8d88ff5ec259 100644 +index f95aa6362605c10145a212ed4b7df42ad443f4cf..e87f593bc61fd60812ea60c597644cd02fc7f7f0 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -35,7 +35,6 @@ import net.minecraft.sounds.SoundSource; @@ -1645,7 +1645,7 @@ index 71189e98dcb71e625defe5a0bd6355597c9382e6..65258190f550a0a2653fc975430d8d88 this.levelData = worlddatamutable; this.dimensionTypeRegistration = holder; this.dimensionTypeId = (ResourceKey) holder.unwrapKey().orElseThrow(() -> { -@@ -862,9 +859,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -863,9 +860,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } protected void tickBlockEntities() { @@ -1655,7 +1655,7 @@ index 71189e98dcb71e625defe5a0bd6355597c9382e6..65258190f550a0a2653fc975430d8d88 timings.tileEntityPending.startTiming(); // Spigot this.tickingBlockEntities = true; if (!this.pendingBlockEntityTickers.isEmpty()) { -@@ -909,7 +903,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -910,7 +904,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { timings.tileEntityTick.stopTiming(); // Spigot this.tickingBlockEntities = false; co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper @@ -1663,7 +1663,7 @@ index 71189e98dcb71e625defe5a0bd6355597c9382e6..65258190f550a0a2653fc975430d8d88 spigotConfig.currentPrimedTnt = 0; // Spigot } -@@ -1102,7 +1095,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1103,7 +1096,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @Override public List getEntities(@Nullable Entity except, AABB box, Predicate predicate) { @@ -1671,7 +1671,7 @@ index 71189e98dcb71e625defe5a0bd6355597c9382e6..65258190f550a0a2653fc975430d8d88 List list = Lists.newArrayList(); ((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call return list; -@@ -1121,7 +1113,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1122,7 +1114,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } public void getEntities(EntityTypeTest filter, AABB box, Predicate predicate, List result, int limit) { @@ -1679,7 +1679,7 @@ index 71189e98dcb71e625defe5a0bd6355597c9382e6..65258190f550a0a2653fc975430d8d88 // Paper start - optimise this call //TODO use limit if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) { -@@ -1377,14 +1368,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1378,14 +1369,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { return false; } diff --git a/patches/server/0032-Improve-container-checking-with-a-bitset.patch b/patches/server/0032-Improve-container-checking-with-a-bitset.patch index 595751d..e5f93c4 100644 --- a/patches/server/0032-Improve-container-checking-with-a-bitset.patch +++ b/patches/server/0032-Improve-container-checking-with-a-bitset.patch @@ -390,7 +390,7 @@ index a71414397bd45ee7bcacfeef0041d80dfa25f114..7743f185672e977520218c3ce6b8ddc9 @Override diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..fd1ea9473f228bc2f96f3dc288b38616807b8edd 100644 +index b11f51762ca289d99eaa49e66e31e58595bcea4e..9aa26d2581df4ef75fffe203d80bc669f3ba6790 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -47,7 +47,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen @@ -462,7 +462,7 @@ index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..fd1ea9473f228bc2f96f3dc288b38616 if (!item.isEmpty()) { foundItem = true; ItemStack origItemStack = item; -@@ -451,11 +477,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -452,11 +478,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen } private static boolean isFullContainer(Container inventory, Direction direction) { @@ -476,7 +476,7 @@ index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..fd1ea9473f228bc2f96f3dc288b38616 } public static boolean suckInItems(Level world, Hopper hopper) { -@@ -636,7 +662,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -637,7 +663,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen if (HopperBlockEntity.canPlaceItemInContainer(to, stack, slot, side)) { boolean flag = false; @@ -485,7 +485,7 @@ index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..fd1ea9473f228bc2f96f3dc288b38616 if (itemstack1.isEmpty()) { // Spigot start - SPIGOT-6693, InventorySubcontainer#setItem -@@ -831,7 +857,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -832,7 +858,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen @Override protected void setItems(NonNullList list) { diff --git a/patches/server/0042-Remove-lambda-from-ticking-guard.patch b/patches/server/0042-Remove-lambda-from-ticking-guard.patch index 83dc333..dad5862 100644 --- a/patches/server/0042-Remove-lambda-from-ticking-guard.patch +++ b/patches/server/0042-Remove-lambda-from-ticking-guard.patch @@ -57,10 +57,10 @@ index b7318670e039e05a058e437e025519d40557bb88..efbc8483a51c5272ca81747c82dc65e7 } } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index dd5d28339d28f344c2e68b43782545e6378117ca..b9431be4e6fb366bbdb7e66c9570f26a37379488 100644 +index 88de79c989320e5f54e1a380e8178085684202de..2968e5fb171fe7ee17afcd2590a1cb26ac287ea2 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1013,13 +1013,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1014,13 +1014,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { try { tickConsumer.accept(entity); MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick 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 11402fd..af01d4c 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 @@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c27af8fc81f09abbb99b2b9cd990477298b210ed..6c4f536601c36730061310ee028da7adeaf2737e 100644 +index 226079fdb0a89ddf09517a20cff22d3e9b153de0..d1ee75ec070ac6f08f120c14c68a02f529d33174 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4296,16 +4296,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4295,16 +4295,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean updateFluidHeightAndDoFluidPushing(TagKey tag, double speed) { @@ -60,7 +60,7 @@ index c27af8fc81f09abbb99b2b9cd990477298b210ed..6c4f536601c36730061310ee028da7ad double d1 = 0.0D; boolean flag = this.isPushedByFluid(); boolean flag1 = false; -@@ -4313,14 +4315,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4312,14 +4314,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { int k1 = 0; BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(); @@ -128,7 +128,7 @@ index c27af8fc81f09abbb99b2b9cd990477298b210ed..6c4f536601c36730061310ee028da7ad if (d2 >= axisalignedbb.minY) { flag1 = true; -@@ -4342,9 +4391,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4341,9 +4390,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // CraftBukkit end } } diff --git a/patches/server/0046-Optimize-entity-coordinate-key.patch b/patches/server/0046-Optimize-entity-coordinate-key.patch index 0aefbbd..9ff113d 100644 --- a/patches/server/0046-Optimize-entity-coordinate-key.patch +++ b/patches/server/0046-Optimize-entity-coordinate-key.patch @@ -22,10 +22,10 @@ data is already available in the blockPosition struct, so we use that instead of re-doing the casting. diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java -index 2d11a67bdc82088abf0b3ca134f352f155c8eb1f..a31d7c1907f40792eefe35038bc6ec7cb67b2f6a 100644 +index cb4379268b191d331c71be44642baac381ffaaf6..77aa75c9b1c31b47513a9d06b0930f9524a3d6d1 100644 --- a/src/main/java/io/papermc/paper/util/MCUtil.java +++ b/src/main/java/io/papermc/paper/util/MCUtil.java -@@ -210,7 +210,7 @@ public final class MCUtil { +@@ -211,7 +211,7 @@ public final class MCUtil { } public static long getCoordinateKey(final Entity entity) { @@ -35,7 +35,7 @@ index 2d11a67bdc82088abf0b3ca134f352f155c8eb1f..a31d7c1907f40792eefe35038bc6ec7c public static long getCoordinateKey(final ChunkPos pair) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6c4f536601c36730061310ee028da7adeaf2737e..47bcb134acdaa8d36a0544dae15f12ea47e143dd 100644 +index d1ee75ec070ac6f08f120c14c68a02f529d33174..d2a8f3260141af6a8bb807bdd581f7c3d5a7dca5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0051-Reduce-hopper-item-checks.patch b/patches/server/0051-Reduce-hopper-item-checks.patch index 1d7e443..a2e6deb 100644 --- a/patches/server/0051-Reduce-hopper-item-checks.patch +++ b/patches/server/0051-Reduce-hopper-item-checks.patch @@ -119,7 +119,7 @@ index a05acf709735b40ca86f978508c63a86065fd405..3752b4ba7fb0d680d4b4a61bf44d54d5 double getLevelY(); diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index fd1ea9473f228bc2f96f3dc288b38616807b8edd..37871156bf18c537de13412a74c9eaff9b776aa6 100644 +index 9aa26d2581df4ef75fffe203d80bc669f3ba6790..d1ba406f481a72513743b549cf450b44ec7aa95e 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -11,6 +11,7 @@ import net.minecraft.core.Direction; @@ -138,7 +138,7 @@ index fd1ea9473f228bc2f96f3dc288b38616807b8edd..37871156bf18c537de13412a74c9eaff import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.HopperMenu; import net.minecraft.world.item.ItemStack; -@@ -501,7 +503,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -502,7 +504,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen } // Paper end }); @@ -147,7 +147,7 @@ index fd1ea9473f228bc2f96f3dc288b38616807b8edd..37871156bf18c537de13412a74c9eaff Iterator iterator = HopperBlockEntity.getItemsAtAndAbove(world, hopper).iterator(); ItemEntity entityitem; -@@ -516,6 +518,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -517,6 +519,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen return true; } @@ -155,7 +155,7 @@ index fd1ea9473f228bc2f96f3dc288b38616807b8edd..37871156bf18c537de13412a74c9eaff } @io.papermc.paper.annotation.DoNotUse // Paper - method unused as logic is inlined above -@@ -823,6 +826,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen +@@ -824,6 +827,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen return first.getCount() < first.getMaxStackSize() && first.is(second.getItem()) && first.getDamageValue() == second.getDamageValue() && ((first.isEmpty() && second.isEmpty()) || java.util.Objects.equals(first.getTag(), second.getTag())); // Paper - used to return true for full itemstacks?! } diff --git a/patches/server/0070-Fix-MC-123848.patch b/patches/server/0070-Fix-MC-123848.patch deleted file mode 100644 index b0f3100..0000000 --- a/patches/server/0070-Fix-MC-123848.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Martijn Muijsers -Date: Tue, 29 Nov 2022 16:25:51 +0100 -Subject: [PATCH] Fix MC-123848 - -License: MIT (https://opensource.org/licenses/MIT) -Gale - https://galemc.org - -This patch is based on the following patch: -"Fix MC-123848" -By: BillyGalbreath -As part of: Purpur (https://github.com/PurpurMC/Purpur) -Licensed under: MIT (https://opensource.org/licenses/MIT) - -* Purpur copyright * - -MIT License - -Copyright (c) 2019-2022 PurpurMC - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 955316687e2e29ad75a0052317a7b0f89034c82a..4fca705a68422e3829d82e024cbadfb077710a6d 100644 ---- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -@@ -287,6 +287,16 @@ public class ItemFrame extends HangingEntity { - } - } - -+ // Gale start - Purpur - fix MC-123848 -+ @Override -+ public @Nullable net.minecraft.world.entity.item.ItemEntity spawnAtLocation(ItemStack stack) { -+ if (!this.level().galeConfig().gameplayMechanics.fixes.mc123848) { -+ return super.spawnAtLocation(stack); -+ } -+ return this.spawnAtLocation(stack, getDirection().equals(Direction.DOWN) ? -0.6F : 0.0F); -+ } -+ // Gale end - Purpur - fix MC-123848 -+ - private void removeFramedMap(ItemStack itemstack) { - // Paper start - fix MC-252817 (green map markers do not disappear) - this.getFramedMapIdFromItem(itemstack).ifPresent((i) -> { -diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 78e9ea40795ad55b948d6ecc6747e4eb5834eba4..aa544ed67ed9db995556d8771417decb5a4d0e82 100644 ---- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -285,6 +285,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public boolean mc238526 = false; - // Gale end - Purpur - fix MC-238526 - -+ // Gale start - Purpur - fix MC-123848 -+ @Setting("mc-123848") -+ public boolean mc123848 = false; -+ // Gale end - Purpur - fix MC-123848 -+ - } - - } diff --git a/patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 97% rename from patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch index 8fd4c6a..d124e20 100644 --- a/patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch +++ b/patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch @@ -64,7 +64,7 @@ index a04374f91f2fbb31219d86b6ae63bcf8fdf7318c..e3b92e8b2274ee6d07d1e9c74f669aea entitycow.setPersistenceRequired(); } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index aa544ed67ed9db995556d8771417decb5a4d0e82..9f8dd7a0113a9723758d0a9779f7f0dd4ec749cf 100644 +index 78e9ea40795ad55b948d6ecc6747e4eb5834eba4..8ef33a1e86e3077b111ab5a735b025b262152236 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -279,7 +279,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0072-Fix-MC-121706.patch b/patches/server/0071-Fix-MC-121706.patch similarity index 91% rename from patches/server/0072-Fix-MC-121706.patch rename to patches/server/0071-Fix-MC-121706.patch index 71167ab..108c0c6 100644 --- a/patches/server/0072-Fix-MC-121706.patch +++ b/patches/server/0071-Fix-MC-121706.patch @@ -65,10 +65,10 @@ index 87fb10096fc9dade33c663234b1cecc34d3d77bb..cb2c6dcdd2be476d0434e7f771bbb251 } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 9f8dd7a0113a9723758d0a9779f7f0dd4ec749cf..aa704ab1f64d0a8572b81e6e41bdb419fba2e4fc 100644 +index 8ef33a1e86e3077b111ab5a735b025b262152236..776bdcc5b19f985f62e3a6aaf7cff232b06bc54e 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -280,7 +280,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -280,12 +280,17 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom @@ -77,9 +77,7 @@ index 9f8dd7a0113a9723758d0a9779f7f0dd4ec749cf..aa704ab1f64d0a8572b81e6e41bdb419 // Gale start - Purpur - fix MC-238526 @Setting("mc-238526") public boolean mc238526 = false; -@@ -291,6 +291,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public boolean mc123848 = false; - // Gale end - Purpur - fix MC-123848 + // Gale end - Purpur - fix MC-238526 + // Gale start - Purpur - fix MC-121706 + @Setting("mc-121706") diff --git a/patches/server/0073-Fix-MC-110386.patch b/patches/server/0072-Fix-MC-110386.patch similarity index 93% rename from patches/server/0073-Fix-MC-110386.patch rename to patches/server/0072-Fix-MC-110386.patch index 70f71cd..55965e4 100644 --- a/patches/server/0073-Fix-MC-110386.patch +++ b/patches/server/0072-Fix-MC-110386.patch @@ -35,10 +35,10 @@ index 80ef4b6649da3049f21624926fa38595d76c5da5..7ce47abc44e0dfe8ff90afeb25b14d8d } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index aa704ab1f64d0a8572b81e6e41bdb419fba2e4fc..899aa60e2c20c4d973777d4f82f524e2fb902c93 100644 +index 776bdcc5b19f985f62e3a6aaf7cff232b06bc54e..a136a07fb890a4672283c456390ce425c41e9cdc 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -296,6 +296,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -291,6 +291,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc121706 = false; // Gale end - Purpur - fix MC-121706 diff --git a/patches/server/0074-Fix-MC-31819.patch b/patches/server/0073-Fix-MC-31819.patch similarity index 93% rename from patches/server/0074-Fix-MC-31819.patch rename to patches/server/0073-Fix-MC-31819.patch index d9c2a91..36eff4d 100644 --- a/patches/server/0074-Fix-MC-31819.patch +++ b/patches/server/0073-Fix-MC-31819.patch @@ -35,10 +35,10 @@ index 58152160d609d0e9d105153aeb166a56a7955603..6a906b1f37e52472527e9f19e965be9f if (!this.abilities.invulnerable) { if (!this.level().isClientSide) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 899aa60e2c20c4d973777d4f82f524e2fb902c93..aab67ad8212bdc5a8afe9b1a9634bde3f78eb496 100644 +index a136a07fb890a4672283c456390ce425c41e9cdc..3364da6da87b040b447a4f74ac4deae47de5edff 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -301,6 +301,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -296,6 +296,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc110386 = true; // Gale end - Mirai - fix MC-110386 diff --git a/patches/server/0075-Fix-MC-26304.patch b/patches/server/0074-Fix-MC-26304.patch similarity index 100% rename from patches/server/0075-Fix-MC-26304.patch rename to patches/server/0074-Fix-MC-26304.patch diff --git a/patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 97% rename from patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch index 378b0c2..4bc17aa 100644 --- a/patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch @@ -49,7 +49,7 @@ index d9baa85962236c42219cf09d4f3129be93ff069c..414a47a82927bed02a4f3cf330c78e46 blockEntity.teleportCooldown = 100; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index aab67ad8212bdc5a8afe9b1a9634bde3f78eb496..37b2bf8dd458b5d8f5dcd2f5b7fd960590be116a 100644 +index 3364da6da87b040b447a4f74ac4deae47de5edff..1bbf6f01d4c8fd4aff7e211a0608cf84c891882a 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -280,6 +280,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0078-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 91% rename from patches/server/0078-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch index 6dacf49..1f4f6ab 100644 --- a/patches/server/0078-Make-arrow-movement-resetting-despawn-counter-config.patch +++ b/patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch @@ -55,14 +55,17 @@ index 7226be19248a1ffb8ff2c89b55882529d33a6c0c..cff4d09af11d1741bf3301b457555d71 @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index c3b2afdb0f35f5cee1bb85e5c64f8638d1dd0886..25aef23dcdce0bbd38a00bd725eb51b8139114e8 100644 +index 1bbf6f01d4c8fd4aff7e211a0608cf84c891882a..37ebe8a033e0b06b38c40017d09f98ed5751e1a5 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -276,6 +276,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -274,7 +274,9 @@ public class GaleWorldConfiguration extends ConfigurationPart { + */ + public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale end - variable entity wake-up duration - - public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks +- ++ + public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable - ++ public Fixes fixes; public class Fixes extends ConfigurationPart { + diff --git a/patches/server/0079-Make-logging-login-locations-configurable.patch b/patches/server/0077-Make-logging-login-locations-configurable.patch similarity index 96% rename from patches/server/0079-Make-logging-login-locations-configurable.patch rename to patches/server/0077-Make-logging-login-locations-configurable.patch index fbddba4..4c08ce9 100644 --- a/patches/server/0079-Make-logging-login-locations-configurable.patch +++ b/patches/server/0077-Make-logging-login-locations-configurable.patch @@ -13,7 +13,7 @@ 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/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 77e6d38d145c98422a41a310337258898c3afb1f..603260943ecd5706b6ed574973287d6d3ad4bbb7 100644 +index afab6cd5ea21c97ea1b8936bd3a00a572d38f48e..f300964912f76cc97074e954dfcddad3e62d4af0 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -480,7 +480,13 @@ public abstract class PlayerList { diff --git a/patches/server/0077-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0077-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch deleted file mode 100644 index a229d80..0000000 --- a/patches/server/0077-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Martijn Muijsers -Date: Wed, 30 Nov 2022 23:16:04 +0100 -Subject: [PATCH] Prevent entities eating blocks in non-ticking chunks - -License: MIT (https://opensource.org/licenses/MIT) -Gale - https://galemc.org - -This patch is based on the following patch: -"Dont eat blocks in non ticking chunks" -By: BillyGalbreath -As part of: Purpur (https://github.com/PurpurMC/Purpur) -Licensed under: MIT (https://opensource.org/licenses/MIT) - -* Purpur copyright * - -MIT License - -Copyright (c) 2019-2022 PurpurMC - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java -index abf796c3369da6b73c8587dfc05f56d0b8933fde..0fe194854a60a8d09f2a793a34132f55cb338713 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java -+++ b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java -@@ -31,10 +31,16 @@ public class EatBlockGoal extends Goal { - - @Override - public boolean canUse() { -+ // Gale start - Purpur - prevent entities eating blocks in non-ticking chunks -+ BlockPos blockposition = this.mob.blockPosition; -+ net.minecraft.world.level.chunk.LevelChunk chunk = this.mob.level().getChunkIfLoaded(blockposition); -+ if (this.mob.level().galeConfig().gameplayMechanics.entitiesCanEatBlocksInNonTickingChunks && (chunk == null || chunk.playerChunk == null || !((net.minecraft.server.level.ServerLevel) this.mob.level()).isPositionEntityTicking(blockposition))) { -+ return false; -+ } -+ // Gale end - Purpur - prevent entities eating blocks in non-ticking chunks - if (this.mob.getRandom().nextInt(this.mob.isBaby() ? 50 : 1000) != 0) { - return false; - } else { -- BlockPos blockposition = this.mob.blockPosition(); - - return EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(blockposition)) ? true : this.level.getBlockState(blockposition.below()).is(Blocks.GRASS_BLOCK); - } -diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 37b2bf8dd458b5d8f5dcd2f5b7fd960590be116a..c3b2afdb0f35f5cee1bb85e5c64f8638d1dd0886 100644 ---- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -274,7 +274,9 @@ public class GaleWorldConfiguration extends ConfigurationPart { - */ - public double entityWakeUpDurationRatioStandardDeviation = 0.2; - // Gale end - variable entity wake-up duration -- -+ -+ public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks -+ - public Fixes fixes; - public class Fixes extends ConfigurationPart { - diff --git a/patches/server/0080-Reduce-array-allocations.patch b/patches/server/0078-Reduce-array-allocations.patch similarity index 98% rename from patches/server/0080-Reduce-array-allocations.patch rename to patches/server/0078-Reduce-array-allocations.patch index 36d2db9..a6f5e2c 100644 --- a/patches/server/0080-Reduce-array-allocations.patch +++ b/patches/server/0078-Reduce-array-allocations.patch @@ -81,7 +81,7 @@ index ae60bd96b5284d54676d8e7e4dd5d170b526ec1e..b269b9b55c10542b16af301be3f43798 return true; } diff --git a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java -index ce449b7b6f615f2c8240e4207f06d4e54ae0083e..c21398bd39bd1e96f8005539909aa7497fb19c9e 100644 +index 7e8dc9e8f381abfdcce2746edc93122d623622d1..66721a27cc9a373a12dffb72c4a403473377eff6 100644 --- a/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java +++ b/src/main/java/io/papermc/paper/world/ChunkEntitySlices.java @@ -2,9 +2,9 @@ package io.papermc.paper.world; @@ -104,7 +104,7 @@ index ce449b7b6f615f2c8240e4207f06d4e54ae0083e..c21398bd39bd1e96f8005539909aa749 } public CompoundTag save() { -@@ -299,7 +299,7 @@ public final class ChunkEntitySlices { +@@ -303,7 +303,7 @@ public final class ChunkEntitySlices { protected static final class BasicEntityList { @@ -113,7 +113,7 @@ index ce449b7b6f615f2c8240e4207f06d4e54ae0083e..c21398bd39bd1e96f8005539909aa749 protected static final int DEFAULT_CAPACITY = 4; protected E[] storage; -@@ -310,7 +310,7 @@ public final class ChunkEntitySlices { +@@ -314,7 +314,7 @@ public final class ChunkEntitySlices { } public BasicEntityList(final int cap) { @@ -122,7 +122,7 @@ index ce449b7b6f615f2c8240e4207f06d4e54ae0083e..c21398bd39bd1e96f8005539909aa749 } public boolean isEmpty() { -@@ -322,7 +322,7 @@ public final class ChunkEntitySlices { +@@ -326,7 +326,7 @@ public final class ChunkEntitySlices { } private void resize() { @@ -469,7 +469,7 @@ index efbc8483a51c5272ca81747c82dc65e7f0f5c232..9879599c38db4f3332c347b6b0c26034 return ret; } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fbcd1384f8a56efeb5f4e6883b41616a784e516a..8c3261e34c3f60f88cbe78b372179cd5fca8d24d 100644 +index a48770650bd2fd52c6a90acd9e69e4fdd9548e30..58fa40518af4c79f01d6b54672dab631c4a7d97b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -29,6 +29,8 @@ import java.util.function.UnaryOperator; @@ -531,7 +531,7 @@ index fbcd1384f8a56efeb5f4e6883b41616a784e516a..8c3261e34c3f60f88cbe78b372179cd5 return; } // Paper end -@@ -3304,7 +3302,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3311,7 +3309,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic // Paper start if (!org.bukkit.Bukkit.isPrimaryThread()) { if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) { @@ -746,7 +746,7 @@ index 25ed5571b24e590bc95056020d84496492b53298..087acc992a83b2a7e40a0e24f00e283c for (int j = 0; j < i; ++j) { diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index ae9b821d71d2868ba4eb3c73558fdcd6caf264e3..77db86efe50ad29bded1cbd02806837b5f506fb3 100644 +index 86304357ca687036cf2448f8cd7c639bdc309e25..d0e2304cd9096c7f1ca4843bb365303f555c1f19 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -1015,7 +1015,7 @@ public final class ItemStack { @@ -798,7 +798,7 @@ index 2bfbdaeb2b0d99dfd956cd5936403fe8b0eeae64..84f1c4c3ded4f201899f3c74e639349b public Enchantments() {} diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index b9431be4e6fb366bbdb7e66c9570f26a37379488..4b8736f19c0b968fac27037d2d0eb3f6d3a2fe94 100644 +index 2968e5fb171fe7ee17afcd2590a1cb26ac287ea2..5efa854354796ff3b045947e1a430ef633b29b63 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -12,6 +12,8 @@ import java.util.function.Consumer; @@ -810,7 +810,7 @@ index b9431be4e6fb366bbdb7e66c9570f26a37379488..4b8736f19c0b968fac27037d2d0eb3f6 import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; import net.minecraft.core.BlockPos; -@@ -1508,7 +1510,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1509,7 +1511,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public org.bukkit.entity.Entity[] getChunkEntities(int chunkX, int chunkZ) { io.papermc.paper.world.ChunkEntitySlices slices = ((ServerLevel)this).getEntityLookup().getChunk(chunkX, chunkZ); if (slices == null) { diff --git a/patches/server/0081-Optimize-sun-burn-tick.patch b/patches/server/0079-Optimize-sun-burn-tick.patch similarity index 96% rename from patches/server/0081-Optimize-sun-burn-tick.patch rename to patches/server/0079-Optimize-sun-burn-tick.patch index 9f434c9..edac788 100644 --- a/patches/server/0081-Optimize-sun-burn-tick.patch +++ b/patches/server/0079-Optimize-sun-burn-tick.patch @@ -13,7 +13,7 @@ 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/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 47bcb134acdaa8d36a0544dae15f12ea47e143dd..4c37f55041de8f315b55d28f3a894f859cc6ef64 100644 +index d2a8f3260141af6a8bb807bdd581f7c3d5a7dca5..9fad45e41872615b47981281d47d8f0278dc4b59 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -305,7 +305,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -25,7 +25,7 @@ index 47bcb134acdaa8d36a0544dae15f12ea47e143dd..4c37f55041de8f315b55d28f3a894f85 public BlockPos blockPosition; // Gale - Pufferfish - optimize entity coordinate key - private -> public private ChunkPos chunkPosition; private Vec3 deltaMovement; -@@ -2006,9 +2006,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2005,9 +2005,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { /** @deprecated */ @Deprecated public float getLightLevelDependentMagicValue() { diff --git a/patches/server/0082-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0080-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0082-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0080-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0083-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0081-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0083-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0081-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0084-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0082-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0084-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0082-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0085-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0083-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0085-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0083-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0086-Replace-class-map-with-optimized-collection.patch b/patches/server/0084-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0086-Replace-class-map-with-optimized-collection.patch rename to patches/server/0084-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0087-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0085-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0087-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0085-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0088-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0086-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0088-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0086-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0089-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0087-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0089-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0087-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0090-Cache-BlockStatePairKey-hash.patch b/patches/server/0088-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0090-Cache-BlockStatePairKey-hash.patch rename to patches/server/0088-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0091-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0089-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0091-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0089-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0092-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0090-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0092-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0090-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0093-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0091-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0093-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0091-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0094-Check-frozen-ticks-before-landing-block.patch b/patches/server/0092-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0094-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0092-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0095-Faster-chunk-serialization.patch b/patches/server/0093-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0095-Faster-chunk-serialization.patch rename to patches/server/0093-Faster-chunk-serialization.patch diff --git a/patches/server/0096-Update-boss-bar-within-tick.patch b/patches/server/0094-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0096-Update-boss-bar-within-tick.patch rename to patches/server/0094-Update-boss-bar-within-tick.patch diff --git a/patches/server/0097-Cache-ominous-banner-item.patch b/patches/server/0095-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0097-Cache-ominous-banner-item.patch rename to patches/server/0095-Cache-ominous-banner-item.patch diff --git a/patches/server/0098-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0096-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0098-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0096-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0099-Cache-world-generator-sea-level.patch b/patches/server/0097-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0099-Cache-world-generator-sea-level.patch rename to patches/server/0097-Cache-world-generator-sea-level.patch diff --git a/patches/server/0100-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0098-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0100-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0098-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0101-Optimize-villager-data-storage.patch b/patches/server/0099-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0101-Optimize-villager-data-storage.patch rename to patches/server/0099-Optimize-villager-data-storage.patch diff --git a/patches/server/0102-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0100-Skip-entity-move-if-movement-is-zero.patch similarity index 90% rename from patches/server/0102-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0100-Skip-entity-move-if-movement-is-zero.patch index 7fceaab..f02b979 100644 --- a/patches/server/0102-Skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0100-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/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4c37f55041de8f315b55d28f3a894f859cc6ef64..15c2e875129db97f379d74f8b5e470a50ed8185b 100644 +index 9fad45e41872615b47981281d47d8f0278dc4b59..307e74d2d116d62b54c9be21bc13c2605733cc3f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -314,6 +314,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -24,7 +24,7 @@ index 4c37f55041de8f315b55d28f3a894f859cc6ef64..15c2e875129db97f379d74f8b5e470a5 public boolean onGround; public boolean horizontalCollision; public boolean verticalCollision; -@@ -1089,6 +1090,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1088,6 +1089,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // Paper end - detailed watchdog information public void move(MoverType movementType, Vec3 movement) { @@ -36,7 +36,7 @@ index 4c37f55041de8f315b55d28f3a894f859cc6ef64..15c2e875129db97f379d74f8b5e470a5 // Paper start - detailed watchdog information io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main"); synchronized (this.posLock) { -@@ -3976,6 +3982,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3975,6 +3981,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public final void setBoundingBox(AABB boundingBox) { diff --git a/patches/server/0103-Store-mob-counts-in-an-array.patch b/patches/server/0101-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0103-Store-mob-counts-in-an-array.patch rename to patches/server/0101-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0104-Use-linked-map-for-entity-trackers.patch b/patches/server/0102-Use-linked-map-for-entity-trackers.patch similarity index 95% rename from patches/server/0104-Use-linked-map-for-entity-trackers.patch rename to patches/server/0102-Use-linked-map-for-entity-trackers.patch index 98a7ea8..e338d66 100644 --- a/patches/server/0104-Use-linked-map-for-entity-trackers.patch +++ b/patches/server/0102-Use-linked-map-for-entity-trackers.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/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index caa765c6264e14cc66973267f94074c7056fe122..780deea4805dfdd80d47e20ca1c2fcac17e5cabc 100644 +index eb12a3c0aefb3d6a42f08439db1ca51e3db65241..767f27759c3372b80d65f00195fcb49e8215fdf4 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -14,6 +14,7 @@ import com.mojang.datafixers.util.Either; diff --git a/patches/server/0105-Optimize-noise-generation.patch b/patches/server/0103-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0105-Optimize-noise-generation.patch rename to patches/server/0103-Optimize-noise-generation.patch diff --git a/patches/server/0106-Optimize-sheep-offspring-color.patch b/patches/server/0104-Optimize-sheep-offspring-color.patch similarity index 98% rename from patches/server/0106-Optimize-sheep-offspring-color.patch rename to patches/server/0104-Optimize-sheep-offspring-color.patch index d795808..28ea7de 100644 --- a/patches/server/0106-Optimize-sheep-offspring-color.patch +++ b/patches/server/0104-Optimize-sheep-offspring-color.patch @@ -110,7 +110,7 @@ index c0e89262c596fbdd0bb3c3f76baccb17a1bb5fcd..d8f99e1221609d481ee79ee31f645731 DyeColor enumcolor1 = ((Sheep) secondParent).getColor(); CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 25aef23dcdce0bbd38a00bd725eb51b8139114e8..3ebd9c177453bf720c40c7f9d41e28a234c80467 100644 +index 37ebe8a033e0b06b38c40017d09f98ed5751e1a5..1ea5a89bb52db60b2bb2a2217a1332432fa06510 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -47,6 +47,21 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0107-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0105-Hide-flames-on-entities-with-fire-resistance.patch similarity index 83% rename from patches/server/0107-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0105-Hide-flames-on-entities-with-fire-resistance.patch index c731822..762bf4c 100644 --- a/patches/server/0107-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0105-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/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 15c2e875129db97f379d74f8b5e470a50ed8185b..2ececcfaf44eb0a0f7be23987dd4d081ffe8120f 100644 +index 307e74d2d116d62b54c9be21bc13c2605733cc3f..2a4132103a937f58f8976d355f2419da816e6af9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -891,7 +891,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -890,7 +890,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.checkBelowWorld(); if (!this.level().isClientSide) { @@ -31,12 +31,12 @@ index 15c2e875129db97f379d74f8b5e470a50ed8185b..2ececcfaf44eb0a0f7be23987dd4d081 this.firstTick = false; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 3ebd9c177453bf720c40c7f9d41e28a234c80467..4329d9bbfe002a4e505b0a2f13063aa8ca736f8f 100644 +index 1ea5a89bb52db60b2bb2a2217a1332432fa06510..70f4ebc71d1b82ac06862752523de1be856df466 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -292,6 +292,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -291,6 +291,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + // Gale end - variable entity wake-up duration - public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable + public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance diff --git a/patches/server/0108-Skip-cloning-advancement-criteria.patch b/patches/server/0106-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0108-Skip-cloning-advancement-criteria.patch rename to patches/server/0106-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0109-Reduce-block-destruction-packet-allocations.patch b/patches/server/0107-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0109-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0107-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0110-Spread-out-sending-all-player-info.patch b/patches/server/0108-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0110-Spread-out-sending-all-player-info.patch rename to patches/server/0108-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0111-Optimize-player-list-for-sending-player-info.patch b/patches/server/0109-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0111-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0109-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0112-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0110-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0112-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0110-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0113-Send-multiple-keep-alive-packets.patch b/patches/server/0111-Send-multiple-keep-alive-packets.patch similarity index 97% rename from patches/server/0113-Send-multiple-keep-alive-packets.patch rename to patches/server/0111-Send-multiple-keep-alive-packets.patch index 814c694..cb9d9d1 100644 --- a/patches/server/0113-Send-multiple-keep-alive-packets.patch +++ b/patches/server/0111-Send-multiple-keep-alive-packets.patch @@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8c3261e34c3f60f88cbe78b372179cd5fca8d24d..1c6e3796cec1867dbffd129087fe614cdcce0eec 100644 +index 58fa40518af4c79f01d6b54672dab631c4a7d97b..b2ee2dbfb5533f738224af0eb3868d6a04a55532 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader; @@ -91,7 +91,7 @@ index 8c3261e34c3f60f88cbe78b372179cd5fca8d24d..1c6e3796cec1867dbffd129087fe614c if (this.keepAlivePending) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info -@@ -3469,6 +3490,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3476,6 +3497,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { diff --git a/patches/server/0114-Make-slow-login-timeout-configurable.patch b/patches/server/0112-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0114-Make-slow-login-timeout-configurable.patch rename to patches/server/0112-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0115-Make-max-interaction-distance-configurable.patch b/patches/server/0113-Make-max-interaction-distance-configurable.patch similarity index 94% rename from patches/server/0115-Make-max-interaction-distance-configurable.patch rename to patches/server/0113-Make-max-interaction-distance-configurable.patch index ef66e24..f9d3d31 100644 --- a/patches/server/0115-Make-max-interaction-distance-configurable.patch +++ b/patches/server/0113-Make-max-interaction-distance-configurable.patch @@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 34ecfb89372f459117db99d57a7edd6f681bbe8a..69d663705ffb4dc904adf1fa2759b4c5096f93ce 100644 +index baf3e79489e310f443788bc917c553ae7ea86c89..f830ff98ac6e94fa4f0c9d85bcdd8f3816ecc645 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -174,7 +174,7 @@ public class ServerPlayerGameMode { @@ -20,7 +20,7 @@ index 34ecfb89372f459117db99d57a7edd6f681bbe8a..69d663705ffb4dc904adf1fa2759b4c5 this.debugLogging(pos, false, sequence, "too far"); } else if (pos.getY() >= worldHeight) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1c6e3796cec1867dbffd129087fe614cdcce0eec..b7f23b3e000a0681e88104a471bc937daaf22234 100644 +index b2ee2dbfb5533f738224af0eb3868d6a04a55532..b3205b20643cf380fa75f0c35bcb77f4496f7055 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -254,7 +254,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -55,7 +55,7 @@ index 1c6e3796cec1867dbffd129087fe614cdcce0eec..b7f23b3e000a0681e88104a471bc937d Vec3 vec3d2 = vec3d.subtract(vec3d1); double d0 = 1.0000001D; -@@ -2829,7 +2836,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2836,7 +2843,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic AABB axisalignedbb = entity.getBoundingBox(); @@ -86,7 +86,7 @@ index d025232b43af3cb8dc28dff2e3e05c72e490901d..06d75d94af6aff29d542d0c5e150d8f7 public void spawnDustParticles(Level world, BlockHitResult hitResult, BlockState state, Vec3 userRotation, HumanoidArm arm) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 4329d9bbfe002a4e505b0a2f13063aa8ca736f8f..b0674c4fa2fc5d990a2039f466d7412e383865f8 100644 +index 70f4ebc71d1b82ac06862752523de1be856df466..fdee39f6bd903924a9bf1c4b92e989b8dac07c43 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -271,7 +271,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -98,7 +98,7 @@ index 4329d9bbfe002a4e505b0a2f13063aa8ca736f8f..b0674c4fa2fc5d990a2039f466d7412e // Gale start - variable entity wake-up duration /** -@@ -294,6 +294,20 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -293,6 +293,20 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance @@ -119,7 +119,7 @@ index 4329d9bbfe002a4e505b0a2f13063aa8ca736f8f..b0674c4fa2fc5d990a2039f466d7412e public Fixes fixes; public class Fixes extends ConfigurationPart { -@@ -328,6 +342,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -322,6 +336,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { } diff --git a/patches/server/0116-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 90% rename from patches/server/0116-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch index f515dc5..ad3b67b 100644 --- a/patches/server/0116-Load-portal-destination-chunk-before-entity-teleport.patch +++ b/patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch @@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2ececcfaf44eb0a0f7be23987dd4d081ffe8120f..570ccff83e1562555d4445d89aa4c647b846d53a 100644 +index 2a4132103a937f58f8976d355f2419da816e6af9..eca5c3b581da9426d109eb71bf9b883362e155df 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3597,6 +3597,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3596,6 +3596,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { Entity entity = this.getType().create(worldserver); if (entity != null) { @@ -31,10 +31,10 @@ index 2ececcfaf44eb0a0f7be23987dd4d081ffe8120f..570ccff83e1562555d4445d89aa4c647 entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - use EntityPortalExitEvent values entity.setDeltaMovement(velocity); // Paper - use EntityPortalExitEvent values diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index b0674c4fa2fc5d990a2039f466d7412e383865f8..20615b75ec9bc37a4dc116271dda9138efeb97ce 100644 +index fdee39f6bd903924a9bf1c4b92e989b8dac07c43..06f3cafbb1b0b38bbd9996206b1a4eff597f81c4 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -342,6 +342,23 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -336,6 +336,23 @@ public class GaleWorldConfiguration extends ConfigurationPart { } diff --git a/patches/server/0117-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 97% rename from patches/server/0117-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch index 45712d8..09035cb 100644 --- a/patches/server/0117-Don-t-load-chunks-to-spawn-phantoms.patch +++ b/patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch @@ -34,7 +34,7 @@ index dfeb3e336e06ef01f5401a362755030db942bb07..518b40a27a8d4d015caa7e67d3558396 if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 20615b75ec9bc37a4dc116271dda9138efeb97ce..b087b7333a801f86e21f170111812263a2829730 100644 +index 06f3cafbb1b0b38bbd9996206b1a4eff597f81c4..dd9052a8b23cfe2005b0cb7494e43f7c7b399870 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -268,6 +268,23 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0118-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 94% rename from patches/server/0118-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch index fe1a257..ebb6101 100644 --- a/patches/server/0118-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -7,10 +7,10 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 570ccff83e1562555d4445d89aa4c647b846d53a..caa053d607907dc5582fd3de2aefa0a9ee8b5bb8 100644 +index eca5c3b581da9426d109eb71bf9b883362e155df..eecf64e6ae6f11d242d2579039b783a013072646 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4515,6 +4515,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4514,6 +4514,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return this.feetBlockState; } @@ -79,7 +79,7 @@ index 2f252bbe2946ea3228933b4b8c91a4e46fe99705..a35891723fad4fe984566c41cdd72800 if (iblockdata.is(BlockTags.CLIMBABLE)) { this.lastClimbablePos = Optional.of(blockposition); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index b087b7333a801f86e21f170111812263a2829730..f33f964fb7f94b5b014464a9b34795bc54549a0a 100644 +index dd9052a8b23cfe2005b0cb7494e43f7c7b399870..c052c33e11a77c5b9af5620f860546e4625e0111 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -283,6 +283,18 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0119-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 96% rename from patches/server/0119-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch index 2b65159..db6f289 100644 --- a/patches/server/0119-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch @@ -38,10 +38,10 @@ index c3076b07077873a852c8a59219bd6aa74f2b9212..0e765c1fb7b93905b7aff8f03fcabba7 @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f33f964fb7f94b5b014464a9b34795bc54549a0a..9669fde1da463395a3214ad9b6535529830e7e56 100644 +index c052c33e11a77c5b9af5620f860546e4625e0111..e6e1b8df926ed8942d98a6f906a3e7b588643f56 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -344,6 +344,22 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -343,6 +343,22 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal diff --git a/patches/server/0120-Ignore-null-legacy-structure-data.patch b/patches/server/0118-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0120-Ignore-null-legacy-structure-data.patch rename to patches/server/0118-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0121-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0119-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0121-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0119-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0122-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 89% rename from patches/server/0122-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch index ba2f232..faf6cf1 100644 --- a/patches/server/0122-Prevent-entities-random-strolling-into-non-ticking-c.patch +++ b/patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch @@ -36,13 +36,13 @@ index 216929c838446c3c14d9b9906ffa625ef35fcbc8..39035605197bad2eb2fd0c4942c5d43b } else { this.wantedX = vec3.x; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 9669fde1da463395a3214ad9b6535529830e7e56..7550bf11983dcd1e3319280bf5b7622b1cb8f1fc 100644 +index e6e1b8df926ed8942d98a6f906a3e7b588643f56..dbb13ee8dffe8cd99f4c5483f08569a8a39f53e1 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -320,6 +320,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -319,6 +319,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale end - variable entity wake-up duration - public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks + public boolean entitiesCanRandomStrollIntoNonTickingChunks = true; // Gale - MultiPaper - prevent entities random strolling into non-ticking chunks public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance diff --git a/patches/server/0123-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0121-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0123-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0121-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0124-CraftBukkit-UUID-to-world-map.patch b/patches/server/0122-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0124-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0122-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0125-Global-EULA-file.patch b/patches/server/0123-Global-EULA-file.patch similarity index 100% rename from patches/server/0125-Global-EULA-file.patch rename to patches/server/0123-Global-EULA-file.patch diff --git a/patches/server/0126-Specific-interval-TPS-API.patch b/patches/server/0124-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0126-Specific-interval-TPS-API.patch rename to patches/server/0124-Specific-interval-TPS-API.patch diff --git a/patches/server/0127-5-second-TPS-average.patch b/patches/server/0125-5-second-TPS-average.patch similarity index 100% rename from patches/server/0127-5-second-TPS-average.patch rename to patches/server/0125-5-second-TPS-average.patch diff --git a/patches/server/0128-Measure-last-tick-time.patch b/patches/server/0126-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0128-Measure-last-tick-time.patch rename to patches/server/0126-Measure-last-tick-time.patch diff --git a/patches/server/0129-Last-tick-time-API.patch b/patches/server/0127-Last-tick-time-API.patch similarity index 100% rename from patches/server/0129-Last-tick-time-API.patch rename to patches/server/0127-Last-tick-time-API.patch diff --git a/patches/server/0130-Show-last-tick-time-in-tps-command.patch b/patches/server/0128-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0130-Show-last-tick-time-in-tps-command.patch rename to patches/server/0128-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0131-Increase-time-statistics-in-intervals.patch b/patches/server/0129-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0131-Increase-time-statistics-in-intervals.patch rename to patches/server/0129-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0132-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0130-For-collision-check-has-physics-before-same-vehicle.patch similarity index 90% rename from patches/server/0132-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0130-For-collision-check-has-physics-before-same-vehicle.patch index 60d74f2..39114a7 100644 --- a/patches/server/0132-For-collision-check-has-physics-before-same-vehicle.patch +++ b/patches/server/0130-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/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index caa053d607907dc5582fd3de2aefa0a9ee8b5bb8..700123581251ced0b6a1d59b776484157adb1d3d 100644 +index eecf64e6ae6f11d242d2579039b783a013072646..8bd042416b1f7c60756285e5b6f298a8ba051ac8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2123,8 +2123,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -2122,8 +2122,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void playerTouch(Player player) {} public void push(Entity entity) { diff --git a/patches/server/0133-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0131-Skip-negligible-planar-movement-multiplication.patch similarity index 91% rename from patches/server/0133-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0131-Skip-negligible-planar-movement-multiplication.patch index 3a5c501..efe49f8 100644 --- a/patches/server/0133-Skip-negligible-planar-movement-multiplication.patch +++ b/patches/server/0131-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/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 700123581251ced0b6a1d59b776484157adb1d3d..d16afd229700563ff81b283625f31a3fbd14cfd1 100644 +index 8bd042416b1f7c60756285e5b6f298a8ba051ac8..05a7f024848048b7bca227212584e2ccc82200f7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1252,9 +1252,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1251,9 +1251,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } this.tryCheckInsideBlocks(); diff --git a/patches/server/0134-Optimize-matching-item-checks.patch b/patches/server/0132-Optimize-matching-item-checks.patch similarity index 94% rename from patches/server/0134-Optimize-matching-item-checks.patch rename to patches/server/0132-Optimize-matching-item-checks.patch index 75f4b65..fbadd0c 100644 --- a/patches/server/0134-Optimize-matching-item-checks.patch +++ b/patches/server/0132-Optimize-matching-item-checks.patch @@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 77db86efe50ad29bded1cbd02806837b5f506fb3..fa6f1fd5e3d78027aa33ce7b32171f2439a1974a 100644 +index d0e2304cd9096c7f1ca4843bb365303f555c1f19..b681ed94170d1d8bc7904b050cb20a609d266a3b 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -750,15 +750,15 @@ public final class ItemStack { diff --git a/patches/server/0135-Reduce-RandomSource-instances.patch b/patches/server/0133-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0135-Reduce-RandomSource-instances.patch rename to patches/server/0133-Reduce-RandomSource-instances.patch diff --git a/patches/server/0136-Server-thread-priority-environment-variable.patch b/patches/server/0134-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0136-Server-thread-priority-environment-variable.patch rename to patches/server/0134-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0137-Instantly-continue-on-world-upgrade-finish.patch b/patches/server/0135-Instantly-continue-on-world-upgrade-finish.patch similarity index 100% rename from patches/server/0137-Instantly-continue-on-world-upgrade-finish.patch rename to patches/server/0135-Instantly-continue-on-world-upgrade-finish.patch