diff --git a/patches/server/0038-Add-redstone-implementation-API.patch b/patches/server/0038-Add-redstone-implementation-API.patch index a24a9a4..6a37b47 100644 --- a/patches/server/0038-Add-redstone-implementation-API.patch +++ b/patches/server/0038-Add-redstone-implementation-API.patch @@ -5,69 +5,54 @@ Subject: [PATCH] Add redstone implementation API diff --git a/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java b/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java -index b6c3aa283b8c6dcd5af4f770301a5481af82f945..43a579795c19d4edd06ec6f301d6c107beaca96f 100644 +index 5d847016f6ee2d6340d8b2234ed35c3b9228632b..5fae13db49b60ea32e046aff64059a08ce626e3f 100644 --- a/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java +++ b/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java -@@ -268,7 +268,7 @@ public class RedStoneWireBlock extends Block { +@@ -300,7 +300,7 @@ public class RedStoneWireBlock extends Block { * Note: Added 'source' argument so as to help determine direction of information flow */ - private void updateSurroundingRedstone(Level worldIn, BlockPos pos, BlockState state, BlockPos source) { + private void updateSurroundingRedstone(Level worldIn, BlockPos pos, BlockState state, @Nullable Orientation orientation, boolean blockAdded) { - if (worldIn.paperConfig().misc.redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.EIGENCRAFT) { -+ if (worldIn.localConfig().config(pos).redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.EIGENCRAFT) { // Sakura - turbo.updateSurroundingRedstone(worldIn, pos, state, source); - return; - } -@@ -292,7 +292,7 @@ public class RedStoneWireBlock extends Block { - int k = worldIn.getBestNeighborSignal(pos1); - this.shouldSignal = true; - -- if (worldIn.paperConfig().misc.redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.VANILLA) { -+ if (worldIn.localConfig().config(pos1).redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.VANILLA) { // Sakura - // This code is totally redundant to if statements just below the loop. - if (k > 0 && k > j - 1) { - j = k; -@@ -306,7 +306,7 @@ public class RedStoneWireBlock extends Block { - // redstone wire will be set to 'k'. If 'k' is already 15, then nothing inside the - // following loop can affect the power level of the wire. Therefore, the loop is - // skipped if k is already 15. -- if (worldIn.paperConfig().misc.redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.VANILLA || k < 15) { -+ if (worldIn.localConfig().config(pos1).redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.VANILLA || k < 15) { // Sakura - for (Direction enumfacing : Direction.Plane.HORIZONTAL) { - BlockPos blockpos = pos1.relative(enumfacing); - boolean flag = blockpos.getX() != pos2.getX() || blockpos.getZ() != pos2.getZ(); -@@ -325,7 +325,7 @@ public class RedStoneWireBlock extends Block { - } - } - -- if (worldIn.paperConfig().misc.redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.VANILLA) { -+ if (worldIn.localConfig().config(pos1).redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.VANILLA) { // Sakura - // The old code would decrement the wire value only by 1 at a time. - if (l > j) { - j = l - 1; -@@ -478,7 +478,7 @@ public class RedStoneWireBlock extends Block { ++ if (worldIn.localConfig().config(pos).redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.EIGENCRAFT) { // Sakura - redstone implementation api + // since 24w33a the source pos is no longer given, but instead an Orientation parameter + // when this is not null, it can be used to find the source pos, which the turbo uses + // to find the direction of information flow +@@ -373,7 +373,7 @@ public class RedStoneWireBlock extends Block { protected void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify) { if (!oldState.is(state.getBlock()) && !world.isClientSide) { // Paper start - optimize redstone - replace call to updatePowerStrength - if (world.paperConfig().misc.redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) { -+ if (world.localConfig().config(pos).redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) { // Sakura - world.getWireHandler().onWireAdded(pos); // Alternate Current ++ if (world.localConfig().config(pos).redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) { // Sakura - redstone implementation api + world.getWireHandler().onWireAdded(pos, state); // Alternate Current } else { - this.updateSurroundingRedstone(world, pos, state, null); // vanilla/Eigencraft -@@ -511,7 +511,7 @@ public class RedStoneWireBlock extends Block { + this.updateSurroundingRedstone(world, pos, state, null, true); // Vanilla/Eigencraft +@@ -398,7 +398,7 @@ public class RedStoneWireBlock extends Block { } // Paper start - optimize redstone - replace call to updatePowerStrength - if (world.paperConfig().misc.redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) { -+ if (world.localConfig().config(pos).redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) { // Sakura ++ if (world.localConfig().config(pos).redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) { // Sakura - redstone implementation api world.getWireHandler().onWireRemoved(pos, state); // Alternate Current } else { - this.updateSurroundingRedstone(world, pos, state, null); // vanilla/Eigencraft -@@ -552,7 +552,7 @@ public class RedStoneWireBlock extends Block { + this.updateSurroundingRedstone(world, pos, state, null, false); // Vanilla/Eigencraft +@@ -428,7 +428,7 @@ public class RedStoneWireBlock extends Block { if (!world.isClientSide) { // Paper start - optimize redstone (Alternate Current) // Alternate Current handles breaking of redstone wires in the WireHandler. - if (world.paperConfig().misc.redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) { -+ if (world.localConfig().config(pos).redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) { // Sakura - world.getWireHandler().onWireUpdated(pos); ++ if (world.localConfig().config(pos).redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) { // Sakura - redstone implementation api + world.getWireHandler().onWireUpdated(pos, state, wireOrientation); } else // Paper end - optimize redstone (Alternate Current) +diff --git a/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneUtils.java b/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneUtils.java +index 8342dd636531729a187aff1bd69878d7aef9d3eb..2272b081152fc70f5034186b36172b4a19e2680b 100644 +--- a/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneUtils.java ++++ b/src/main/java/net/minecraft/world/level/redstone/ExperimentalRedstoneUtils.java +@@ -18,6 +18,7 @@ public class ExperimentalRedstoneUtils { + orientation = orientation.withFront(up); + } + // Paper start - Optimize redstone (Alternate Current) - use default front instead of random ++ // Sakura - redstone implementation api; conflict on change + else if (world.paperConfig().misc.redstoneImplementation == io.papermc.paper.configuration.WorldConfiguration.Misc.RedstoneImplementation.ALTERNATE_CURRENT) { + orientation = orientation.withFront(Direction.WEST); + } diff --git a/patches/server/0038-Allow-water-in-the-nether.patch b/patches/server/0039-Allow-water-in-the-nether.patch similarity index 100% rename from patches/server/0038-Allow-water-in-the-nether.patch rename to patches/server/0039-Allow-water-in-the-nether.patch diff --git a/patches/server/0039-Configure-concrete-solidifying-in-water.patch b/patches/server/0040-Configure-concrete-solidifying-in-water.patch similarity index 100% rename from patches/server/0039-Configure-concrete-solidifying-in-water.patch rename to patches/server/0040-Configure-concrete-solidifying-in-water.patch diff --git a/patches/server/0040-Option-for-fast-nether-dimension-lava.patch b/patches/server/0041-Option-for-fast-nether-dimension-lava.patch similarity index 100% rename from patches/server/0040-Option-for-fast-nether-dimension-lava.patch rename to patches/server/0041-Option-for-fast-nether-dimension-lava.patch diff --git a/patches/server/0041-Allow-explosions-to-destroy-lava.patch b/patches/server/0042-Allow-explosions-to-destroy-lava.patch similarity index 95% rename from patches/server/0041-Allow-explosions-to-destroy-lava.patch rename to patches/server/0042-Allow-explosions-to-destroy-lava.patch index 07cb737..90acd52 100644 --- a/patches/server/0041-Allow-explosions-to-destroy-lava.patch +++ b/patches/server/0042-Allow-explosions-to-destroy-lava.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow explosions to destroy lava diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java -index 97debcf36d4aa3f8a6c83d35c53ba95342966fbf..0789f37ae89b22f9e3500b25cbe27ef853950b85 100644 +index bdc3ff8cbe4e5eaa9d9a34f38fdd150f7368e33b..e857fd02a5e341a1a701da71874dbd850e3c5a5d 100644 --- a/src/main/java/net/minecraft/world/level/ServerExplosion.java +++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java @@ -407,6 +407,11 @@ public class ServerExplosion implements Explosion { diff --git a/patches/server/0042-Disable-bubble-columns-affecting-cannon-entities.patch b/patches/server/0043-Disable-bubble-columns-affecting-cannon-entities.patch similarity index 100% rename from patches/server/0042-Disable-bubble-columns-affecting-cannon-entities.patch rename to patches/server/0043-Disable-bubble-columns-affecting-cannon-entities.patch diff --git a/patches/server/0043-Treat-solid-blocks-as-full-when-moving-fast.patch b/patches/server/0044-Treat-solid-blocks-as-full-when-moving-fast.patch similarity index 100% rename from patches/server/0043-Treat-solid-blocks-as-full-when-moving-fast.patch rename to patches/server/0044-Treat-solid-blocks-as-full-when-moving-fast.patch diff --git a/patches/server/0044-Reduce-entity-tracker-player-updates.patch b/patches/server/0045-Reduce-entity-tracker-player-updates.patch similarity index 100% rename from patches/server/0044-Reduce-entity-tracker-player-updates.patch rename to patches/server/0045-Reduce-entity-tracker-player-updates.patch diff --git a/patches/server/0045-Add-option-for-legacy-lava-block-formation.patch b/patches/server/0046-Add-option-for-legacy-lava-block-formation.patch similarity index 100% rename from patches/server/0045-Add-option-for-legacy-lava-block-formation.patch rename to patches/server/0046-Add-option-for-legacy-lava-block-formation.patch diff --git a/patches/server/0046-Configure-mob-spawner-defaults.patch b/patches/server/0047-Configure-mob-spawner-defaults.patch similarity index 100% rename from patches/server/0046-Configure-mob-spawner-defaults.patch rename to patches/server/0047-Configure-mob-spawner-defaults.patch diff --git a/patches/server/0047-Allow-disabling-random-dispenser-item-selection.patch b/patches/server/0048-Allow-disabling-random-dispenser-item-selection.patch similarity index 100% rename from patches/server/0047-Allow-disabling-random-dispenser-item-selection.patch rename to patches/server/0048-Allow-disabling-random-dispenser-item-selection.patch diff --git a/patches/server/0048-Add-instant-mob-death-animation.patch b/patches/server/0049-Add-instant-mob-death-animation.patch similarity index 100% rename from patches/server/0048-Add-instant-mob-death-animation.patch rename to patches/server/0049-Add-instant-mob-death-animation.patch diff --git a/patches/server/0049-Configure-fluids-breaking-redstone.patch b/patches/server/0050-Configure-fluids-breaking-redstone.patch similarity index 100% rename from patches/server/0049-Configure-fluids-breaking-redstone.patch rename to patches/server/0050-Configure-fluids-breaking-redstone.patch diff --git a/patches/server/0050-Option-to-disable-explosions-hurting-players.patch b/patches/server/0051-Option-to-disable-explosions-hurting-players.patch similarity index 100% rename from patches/server/0050-Option-to-disable-explosions-hurting-players.patch rename to patches/server/0051-Option-to-disable-explosions-hurting-players.patch diff --git a/patches/server/0051-Iron-golems-take-fall-damage.patch b/patches/server/0052-Iron-golems-take-fall-damage.patch similarity index 100% rename from patches/server/0051-Iron-golems-take-fall-damage.patch rename to patches/server/0052-Iron-golems-take-fall-damage.patch diff --git a/patches/server/0052-Add-explosions-dropping-items-config.patch b/patches/server/0053-Add-explosions-dropping-items-config.patch similarity index 100% rename from patches/server/0052-Add-explosions-dropping-items-config.patch rename to patches/server/0053-Add-explosions-dropping-items-config.patch diff --git a/patches/server/0053-Avoid-searching-for-lava-if-throttled-water-flow-spe.patch b/patches/server/0054-Avoid-searching-for-lava-if-throttled-water-flow-spe.patch similarity index 100% rename from patches/server/0053-Avoid-searching-for-lava-if-throttled-water-flow-spe.patch rename to patches/server/0054-Avoid-searching-for-lava-if-throttled-water-flow-spe.patch diff --git a/patches/server/0054-Calculate-biome-noise-once-per-chunk-section.patch b/patches/server/0055-Calculate-biome-noise-once-per-chunk-section.patch similarity index 100% rename from patches/server/0054-Calculate-biome-noise-once-per-chunk-section.patch rename to patches/server/0055-Calculate-biome-noise-once-per-chunk-section.patch diff --git a/patches/server/0055-Fix-doEntityDrops-gamerule-preventing-falling-blocks.patch b/patches/server/0056-Fix-doEntityDrops-gamerule-preventing-falling-blocks.patch similarity index 100% rename from patches/server/0055-Fix-doEntityDrops-gamerule-preventing-falling-blocks.patch rename to patches/server/0056-Fix-doEntityDrops-gamerule-preventing-falling-blocks.patch diff --git a/patches/server/0056-Add-entity-travel-distance-limits.patch b/patches/server/0057-Add-entity-travel-distance-limits.patch similarity index 100% rename from patches/server/0056-Add-entity-travel-distance-limits.patch rename to patches/server/0057-Add-entity-travel-distance-limits.patch diff --git a/patches/server/0057-Configure-potion-speed-and-breaking-inside-entities.patch b/patches/server/0058-Configure-potion-speed-and-breaking-inside-entities.patch similarity index 100% rename from patches/server/0057-Configure-potion-speed-and-breaking-inside-entities.patch rename to patches/server/0058-Configure-potion-speed-and-breaking-inside-entities.patch diff --git a/patches/server/0058-Add-outline-colliison-to-enderpearls.patch b/patches/server/0059-Add-outline-colliison-to-enderpearls.patch similarity index 100% rename from patches/server/0058-Add-outline-colliison-to-enderpearls.patch rename to patches/server/0059-Add-outline-colliison-to-enderpearls.patch diff --git a/patches/server/0059-Disable-player-poses-shrinking-collision-box.patch b/patches/server/0060-Disable-player-poses-shrinking-collision-box.patch similarity index 100% rename from patches/server/0059-Disable-player-poses-shrinking-collision-box.patch rename to patches/server/0060-Disable-player-poses-shrinking-collision-box.patch diff --git a/patches/server/0060-Mob-spawner-behaviour.patch b/patches/server/0061-Mob-spawner-behaviour.patch similarity index 100% rename from patches/server/0060-Mob-spawner-behaviour.patch rename to patches/server/0061-Mob-spawner-behaviour.patch diff --git a/patches/server/0061-Use-random-chance-for-crop-growth-instead-of-age.patch b/patches/server/0062-Use-random-chance-for-crop-growth-instead-of-age.patch similarity index 100% rename from patches/server/0061-Use-random-chance-for-crop-growth-instead-of-age.patch rename to patches/server/0062-Use-random-chance-for-crop-growth-instead-of-age.patch diff --git a/patches/server/0062-Protect-block-shapes-against-plugins.patch b/patches/server/0063-Protect-block-shapes-against-plugins.patch similarity index 100% rename from patches/server/0062-Protect-block-shapes-against-plugins.patch rename to patches/server/0063-Protect-block-shapes-against-plugins.patch diff --git a/patches/server/0063-Legacy-player-combat-mechanics.patch b/patches/server/0064-Legacy-player-combat-mechanics.patch similarity index 100% rename from patches/server/0063-Legacy-player-combat-mechanics.patch rename to patches/server/0064-Legacy-player-combat-mechanics.patch diff --git a/patches/server/0064-Allow-disabling-sweep-attacks.patch b/patches/server/0065-Allow-disabling-sweep-attacks.patch similarity index 100% rename from patches/server/0064-Allow-disabling-sweep-attacks.patch rename to patches/server/0065-Allow-disabling-sweep-attacks.patch diff --git a/patches/server/0065-Change-shields-to-reduce-damage.patch b/patches/server/0066-Change-shields-to-reduce-damage.patch similarity index 100% rename from patches/server/0065-Change-shields-to-reduce-damage.patch rename to patches/server/0066-Change-shields-to-reduce-damage.patch diff --git a/patches/server/0066-Old-enchanted-golden-apples.patch b/patches/server/0067-Old-enchanted-golden-apples.patch similarity index 100% rename from patches/server/0066-Old-enchanted-golden-apples.patch rename to patches/server/0067-Old-enchanted-golden-apples.patch diff --git a/patches/server/0067-Configure-fast-health-regen.patch b/patches/server/0068-Configure-fast-health-regen.patch similarity index 100% rename from patches/server/0067-Configure-fast-health-regen.patch rename to patches/server/0068-Configure-fast-health-regen.patch diff --git a/patches/server/0068-Add-option-for-fishing-hooks-pulling-entities.patch b/patches/server/0069-Add-option-for-fishing-hooks-pulling-entities.patch similarity index 100% rename from patches/server/0068-Add-option-for-fishing-hooks-pulling-entities.patch rename to patches/server/0069-Add-option-for-fishing-hooks-pulling-entities.patch diff --git a/patches/server/0069-Old-combat-sounds-and-particle-effects.patch b/patches/server/0070-Old-combat-sounds-and-particle-effects.patch similarity index 100% rename from patches/server/0069-Old-combat-sounds-and-particle-effects.patch rename to patches/server/0070-Old-combat-sounds-and-particle-effects.patch diff --git a/patches/server/0070-Protect-scaffolding-from-creepers.patch b/patches/server/0071-Protect-scaffolding-from-creepers.patch similarity index 92% rename from patches/server/0070-Protect-scaffolding-from-creepers.patch rename to patches/server/0071-Protect-scaffolding-from-creepers.patch index ce25dc9..b99fbb0 100644 --- a/patches/server/0070-Protect-scaffolding-from-creepers.patch +++ b/patches/server/0071-Protect-scaffolding-from-creepers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Protect scaffolding from creepers diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java -index ace34cc86061bb4c9b080c6e9bf912b1fe3533a6..280308766cd41924e209d5816c047ceae0ec1085 100644 +index 0dae16d140666cae7633bbfef6d1c5b979d7dc9e..a9a63fa9d2c45298ebd4146e0dfeea54b6431797 100644 --- a/src/main/java/net/minecraft/world/level/ServerExplosion.java +++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java @@ -412,6 +412,11 @@ public class ServerExplosion implements Explosion { diff --git a/patches/server/0071-Entity-tracking-range-modifier.patch b/patches/server/0072-Entity-tracking-range-modifier.patch similarity index 100% rename from patches/server/0071-Entity-tracking-range-modifier.patch rename to patches/server/0072-Entity-tracking-range-modifier.patch diff --git a/patches/server/0072-Set-entity-impulse-on-explosion.patch b/patches/server/0073-Set-entity-impulse-on-explosion.patch similarity index 100% rename from patches/server/0072-Set-entity-impulse-on-explosion.patch rename to patches/server/0073-Set-entity-impulse-on-explosion.patch diff --git a/patches/server/0073-Configurable-left-shooting-and-adjusting-limits.patch b/patches/server/0074-Configurable-left-shooting-and-adjusting-limits.patch similarity index 98% rename from patches/server/0073-Configurable-left-shooting-and-adjusting-limits.patch rename to patches/server/0074-Configurable-left-shooting-and-adjusting-limits.patch index 0e8a479..7a87212 100644 --- a/patches/server/0073-Configurable-left-shooting-and-adjusting-limits.patch +++ b/patches/server/0074-Configurable-left-shooting-and-adjusting-limits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable left shooting and adjusting limits diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0868f3d8d93e4c360a0a53df741950789f3c6a1c..1dbad44adfb735d8ff4aa55f0b45353404386fef 100644 +index ee8816ec238a38667cdf0f0f749c02b78a6477bd..9adc5164580a291585789948091ec192aff6d968 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -694,6 +694,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0074-Optimise-hopper-ticking.patch b/patches/server/0075-Optimise-hopper-ticking.patch similarity index 99% rename from patches/server/0074-Optimise-hopper-ticking.patch rename to patches/server/0075-Optimise-hopper-ticking.patch index 1d6d396..0dd7075 100644 --- a/patches/server/0074-Optimise-hopper-ticking.patch +++ b/patches/server/0075-Optimise-hopper-ticking.patch @@ -42,7 +42,7 @@ index 5db5ba026462ca642dcee718af732f80fadabef5..51e26395b53628b34b1f7f68935a9ba4 boolean isEmpty(); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 8c41282eafc1201bf1c0d001fb4fe791f3173f87..4361a08c3f60980c86f5b7953d6171016ad7166b 100644 +index b8d59ca87e908ce2bdd978007e3a97e297a10278..cdd56fedb0e0703e820fe807789e0fad78d4b409 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1648,7 +1648,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl diff --git a/patches/server/0075-Tick-entity-schedulers-only-when-necessary.patch b/patches/server/0076-Tick-entity-schedulers-only-when-necessary.patch similarity index 98% rename from patches/server/0075-Tick-entity-schedulers-only-when-necessary.patch rename to patches/server/0076-Tick-entity-schedulers-only-when-necessary.patch index 6b1fe7e..bbf440c 100644 --- a/patches/server/0075-Tick-entity-schedulers-only-when-necessary.patch +++ b/patches/server/0076-Tick-entity-schedulers-only-when-necessary.patch @@ -83,7 +83,7 @@ index c03608fec96b51e1867f43d8f42e5aefb1520e46..32ac34e6ca4a7443e894369fee349911 return true; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7aaf3794338b8208ded6549e61479010c369ad87..4f5a34c27c281eee38c6c8262c365bd66725b340 100644 +index 8bfa214dccc6e721ba68a442a2175c3f6c15bc95..bb73017b30a76fc515f4258b79b322d93964cc9a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1810,7 +1810,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop