diff --git a/patches/server/0005-Fix-decompile-errors.patch b/patches/server/0005-Fix-decompile-errors.patch new file mode 100644 index 000000000..484e7397a --- /dev/null +++ b/patches/server/0005-Fix-decompile-errors.patch @@ -0,0 +1,131 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: BillyGalbreath +Date: Sun, 12 Jun 2022 06:20:21 -0500 +Subject: [PATCH] Fix decompile errors + + +diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java +index b6fc1b495e9173e625a7b2c856e79146734c4a9e..765dee56dd3a77e4bce137b84c4139202a5cef84 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java ++++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java +@@ -92,7 +92,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationL + + @Override + public Brain getBrain() { +- return super.getBrain(); ++ return (Brain) super.getBrain(); // Purpur - decompile error + } + + public static AttributeSupplier.Builder createAttributes() { +@@ -141,8 +141,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationL + + @Override + public boolean hurt(DamageSource source, float amount) { +- Entity optional = source.getEntity(); +- if (optional instanceof Player player) { ++ if (source.getEntity() instanceof Player player) { // Purpur - decompile error + Optional optional = this.getBrain().getMemory(MemoryModuleType.LIKED_PLAYER); + if (optional.isPresent() && player.getUUID().equals(optional.get())) { + return false; +diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java +index 01f8d11ee4441a1c4d87427e3f9bcd7155259a5b..9e17e21a48892686e94a1c21b636695ab84eb7cd 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java ++++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java +@@ -105,7 +105,7 @@ public class Frog extends Animal { + + @Override + public Brain getBrain() { +- return super.getBrain(); ++ return (Brain) super.getBrain(); // Purpur - decompile error + } + + @Override +diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java +index 45152840f10c2e0731ac653595dc0e81557227c4..7d093e4cc3357abd205302a98cc7b06cf55229bc 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java ++++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java +@@ -67,7 +67,7 @@ public class Tadpole extends AbstractFish { + + @Override + public Brain getBrain() { +- return super.getBrain(); ++ return (Brain) super.getBrain(); // Purpur - decompile error + } + + @Override +@@ -215,8 +215,7 @@ public class Tadpole extends AbstractFish { + } + + private void ageUp() { +- Level frog = this.level; +- if (frog instanceof ServerLevel serverLevel) { ++ if (this.level instanceof ServerLevel serverLevel) { // Purpur - decompile error + Frog frog = EntityType.FROG.create(this.level); + frog.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot()); + frog.finalizeSpawn(serverLevel, this.level.getCurrentDifficultyAt(frog.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData)null, (CompoundTag)null); +diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java +index 056e4c2f7f632dadc0015710c032a0b718d46ff9..1fb11985dcfd07ded1f7cadf3fdba7d23ca4f87b 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java ++++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java +@@ -90,11 +90,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { + } + + private static void initIdleActivity(Brain brain) { +- brain.addActivity(Activity.IDLE, 10, ImmutableList.of(new StartAttacking<>(Zoglin::findNearestValidAttackTarget), new RunSometimes(new SetEntityLookTarget(8.0F), UniformInt.of(30, 60)), new RunOne(ImmutableList.of(Pair.of(new RandomStroll(0.4F), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4F, 3), 2), Pair.of(new DoNothing(30, 60), 1))))); ++ brain.addActivity(Activity.IDLE, 10, ImmutableList.of(new StartAttacking<>(Zoglin::findNearestValidAttackTarget), new RunSometimes<>(new SetEntityLookTarget(8.0F), UniformInt.of(30, 60)), new RunOne<>(ImmutableList.of(Pair.of(new RandomStroll(0.4F), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4F, 3), 2), Pair.of(new DoNothing(30, 60), 1))))); // Purpur - decompile error + } + + private static void initFightActivity(Brain brain) { +- brain.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0F), new RunIf<>(Zoglin::isAdult, new MeleeAttack(40)), new RunIf<>(Zoglin::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid()), MemoryModuleType.ATTACK_TARGET); ++ brain.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0F), new RunIf<>(Zoglin::isAdult, new MeleeAttack(40)), new RunIf<>(Zoglin::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid<>()), MemoryModuleType.ATTACK_TARGET); // Purpur - decompile error + } + + private Optional findNearestValidAttackTarget() { +@@ -183,7 +183,7 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { + + @Override + public Brain getBrain() { +- return super.getBrain(); ++ return (Brain) super.getBrain(); // Purpur - decompile error + } + + protected void updateActivity() { +diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java +index ac75c54e897565e340b66823caeed92ba1d1641a..769e4fbaac01a4fe3a45bd9cab5c63b61fc69f53 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java ++++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java +@@ -70,7 +70,7 @@ public class PiglinBrute extends AbstractPiglin { + + @Override + public Brain getBrain() { +- return super.getBrain(); ++ return (Brain) super.getBrain(); // Purpur - decompile error + } + + @Override +diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java +index 60410fd12e0fcfbaad3b4dc431452f8b2e6276c7..4366f7ff095c79a1f4444a27198f2613eb01fdc2 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java ++++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java +@@ -361,7 +361,7 @@ public class Warden extends Monster implements VibrationListener.VibrationListen + + @Override + public Brain getBrain() { +- return super.getBrain(); ++ return (Brain) super.getBrain(); // Purpur - decompile error + } + + @Override +diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java +index 5dc3605fed7fb2ff8cc6c965d1bf99c462e0b14a..bcc1ce196c1dbf60cf6ae73d95766dc41ed22012 100644 +--- a/src/main/java/net/minecraft/world/level/block/Blocks.java ++++ b/src/main/java/net/minecraft/world/level/block/Blocks.java +@@ -1091,7 +1091,7 @@ public class Blocks { + } + + private static Boolean ocelotOrParrot(BlockState state, BlockGetter world, BlockPos pos, EntityType type) { +- return (boolean)type == EntityType.OCELOT || type == EntityType.PARROT; ++ return type == EntityType.OCELOT || type == EntityType.PARROT; // Purpur - decompile error + } + + private static BedBlock bed(DyeColor color) { diff --git a/patches/server/0005-Component-related-conveniences.patch b/patches/server/0006-Component-related-conveniences.patch similarity index 98% rename from patches/server/0005-Component-related-conveniences.patch rename to patches/server/0006-Component-related-conveniences.patch index 67c21d399..40ee8b6af 100644 --- a/patches/server/0005-Component-related-conveniences.patch +++ b/patches/server/0006-Component-related-conveniences.patch @@ -81,7 +81,7 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0 return this.isFireSource; } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fa3263bffcfe042c2f210f85c6868fff08132a7c..2ec7eed33a322254ea9382554e0b7bfc558e0960 100644 +index 4d57f2b8d08a83e404f0b81321b18c83a47ddb4e..cba8aec79f7f1664a1410646c733f57f3c39ca5e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3765,6 +3765,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0006-Ridables.patch b/patches/server/0007-Ridables.patch similarity index 99% rename from patches/server/0006-Ridables.patch rename to patches/server/0007-Ridables.patch index dbe1e0301..9ca8db4bd 100644 --- a/patches/server/0006-Ridables.patch +++ b/patches/server/0007-Ridables.patch @@ -4493,7 +4493,7 @@ index 6449213d717271bcc516e393a78dfe1e5c762d68..3b272b5653c6e7672f16eb35314c6899 protected void registerGoals() { this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractPiglin.class, true)); diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java -index 056e4c2f7f632dadc0015710c032a0b718d46ff9..a6aaffc41a39be4ae1da44d54a27d324927e47d0 100644 +index 1fb11985dcfd07ded1f7cadf3fdba7d23ca4f87b..9970c2c09b294e601b7cda4f1e8cbf2aed13b0dc 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java @@ -68,6 +68,23 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { @@ -4520,29 +4520,6 @@ index 056e4c2f7f632dadc0015710c032a0b718d46ff9..a6aaffc41a39be4ae1da44d54a27d324 @Override protected Brain.Provider brainProvider() { return Brain.provider(MEMORY_TYPES, SENSOR_TYPES); -@@ -90,11 +107,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { - } - - private static void initIdleActivity(Brain brain) { -- brain.addActivity(Activity.IDLE, 10, ImmutableList.of(new StartAttacking<>(Zoglin::findNearestValidAttackTarget), new RunSometimes(new SetEntityLookTarget(8.0F), UniformInt.of(30, 60)), new RunOne(ImmutableList.of(Pair.of(new RandomStroll(0.4F), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4F, 3), 2), Pair.of(new DoNothing(30, 60), 1))))); -+ brain.addActivity(Activity.IDLE, 10, ImmutableList.of(new StartAttacking<>(Zoglin::findNearestValidAttackTarget), new RunSometimes<>(new SetEntityLookTarget(8.0F), UniformInt.of(30, 60)), new RunOne<>(ImmutableList.of(Pair.of(new RandomStroll(0.4F), 2), Pair.of(new SetWalkTargetFromLookTarget(0.4F, 3), 2), Pair.of(new DoNothing(30, 60), 1))))); // Purpur - decompile fix - } - - private static void initFightActivity(Brain brain) { -- brain.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0F), new RunIf<>(Zoglin::isAdult, new MeleeAttack(40)), new RunIf<>(Zoglin::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid()), MemoryModuleType.ATTACK_TARGET); -+ brain.addActivityAndRemoveMemoryWhenStopped(Activity.FIGHT, 10, ImmutableList.of(new SetWalkTargetFromAttackTargetIfTargetOutOfReach(1.0F), new RunIf<>(Zoglin::isAdult, new MeleeAttack(40)), new RunIf<>(Zoglin::isBaby, new MeleeAttack(15)), new StopAttackingIfTargetInvalid<>()), MemoryModuleType.ATTACK_TARGET); // Purpur - decompile fix - } - - private Optional findNearestValidAttackTarget() { -@@ -183,7 +200,7 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { - - @Override - public Brain getBrain() { -- return super.getBrain(); -+ return (Brain) super.getBrain(); // Purpur - decompile error - } - - protected void updateActivity() { @@ -200,6 +217,7 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { @Override protected void customServerAiStep() { @@ -4717,7 +4694,7 @@ index 9bde52b723237b1f0f945bc564009e3507993508..b5b2d1f8ab8dedfa38e0ed4c99a0e008 this.level.getProfiler().pop(); PiglinAi.updateActivity(this); diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java -index ac75c54e897565e340b66823caeed92ba1d1641a..ff149234a8f3e1c94961e41d5bc8117460b301d9 100644 +index 769e4fbaac01a4fe3a45bd9cab5c63b61fc69f53..ff149234a8f3e1c94961e41d5bc8117460b301d9 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java @@ -41,6 +41,23 @@ public class PiglinBrute extends AbstractPiglin { @@ -4744,15 +4721,6 @@ index ac75c54e897565e340b66823caeed92ba1d1641a..ff149234a8f3e1c94961e41d5bc81174 public static AttributeSupplier.Builder createAttributes() { return Monster.createMonsterAttributes().add(Attributes.MAX_HEALTH, 50.0D).add(Attributes.MOVEMENT_SPEED, (double)0.35F).add(Attributes.ATTACK_DAMAGE, 7.0D); } -@@ -70,7 +87,7 @@ public class PiglinBrute extends AbstractPiglin { - - @Override - public Brain getBrain() { -- return super.getBrain(); -+ return (Brain) super.getBrain(); // Purpur - decompile error - } - - @Override @@ -86,6 +103,7 @@ public class PiglinBrute extends AbstractPiglin { @Override protected void customServerAiStep() { diff --git a/patches/server/0007-Configurable-entity-base-attributes.patch b/patches/server/0008-Configurable-entity-base-attributes.patch similarity index 99% rename from patches/server/0007-Configurable-entity-base-attributes.patch rename to patches/server/0008-Configurable-entity-base-attributes.patch index cf67c36a4..14d932a29 100644 --- a/patches/server/0007-Configurable-entity-base-attributes.patch +++ b/patches/server/0008-Configurable-entity-base-attributes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index dd4f434d26814f46285f2bd23f8a4b53c89872d7..aea8814bf1ed44075c54b18fcdc8676579f07a6e 100644 +index e2b2be41e9981196650096dd9d468618a96cb28e..5fa0b40eaa545d1047591f7166bb43e1872ffe34 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -155,7 +155,7 @@ import org.bukkit.plugin.PluginManager; @@ -1297,7 +1297,7 @@ index 3b272b5653c6e7672f16eb35314c689910c14250..b374069a1e88db67a56d6d5f9e05318c @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java -index a6aaffc41a39be4ae1da44d54a27d324927e47d0..a91ec2e385940b12bc41d9c09819c9081edc5c44 100644 +index 9970c2c09b294e601b7cda4f1e8cbf2aed13b0dc..6236a557d2a73dff70141140f79faf851a2062f0 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java @@ -83,6 +83,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { diff --git a/patches/server/0008-Timings-stuff.patch b/patches/server/0009-Timings-stuff.patch similarity index 100% rename from patches/server/0008-Timings-stuff.patch rename to patches/server/0009-Timings-stuff.patch diff --git a/patches/server/0009-Barrels-and-enderchests-6-rows.patch b/patches/server/0010-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from patches/server/0009-Barrels-and-enderchests-6-rows.patch rename to patches/server/0010-Barrels-and-enderchests-6-rows.patch diff --git a/patches/server/0010-Llama-API.patch b/patches/server/0011-Llama-API.patch similarity index 100% rename from patches/server/0010-Llama-API.patch rename to patches/server/0011-Llama-API.patch diff --git a/patches/server/0011-AFK-API.patch b/patches/server/0012-AFK-API.patch similarity index 99% rename from patches/server/0011-AFK-API.patch rename to patches/server/0012-AFK-API.patch index 6642c37bc..d2d099a54 100644 --- a/patches/server/0011-AFK-API.patch +++ b/patches/server/0012-AFK-API.patch @@ -68,7 +68,7 @@ index f4b33e5788665eefef35e701ed99d58d0ea1b3c2..e40e8e837273c243f5ccc192514d5404 return this.stats; } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3b7427d6d59006c84fbd8d16d4446e7670761e66..df5cbfda7b3eae38583d01ea96874bdb7f5b3b65 100644 +index 22fad6467c6b9202e8cbf3e77e90c50f73f1f640..c48b44129881d864cca6254b222d0ecbb7d78bcf 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -313,6 +313,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0012-Bring-back-server-name.patch b/patches/server/0013-Bring-back-server-name.patch similarity index 100% rename from patches/server/0012-Bring-back-server-name.patch rename to patches/server/0013-Bring-back-server-name.patch diff --git a/patches/server/0013-Configurable-server-mod-name.patch b/patches/server/0014-Configurable-server-mod-name.patch similarity index 94% rename from patches/server/0013-Configurable-server-mod-name.patch rename to patches/server/0014-Configurable-server-mod-name.patch index 42b9d388d..e44e42ec6 100644 --- a/patches/server/0013-Configurable-server-mod-name.patch +++ b/patches/server/0014-Configurable-server-mod-name.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable server mod name diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bee6004f68f344b2979f9262d99d5d08802751ab..b844bffb6363efcb4d8a6fc8489542d7bcfa35d0 100644 +index d4b05231b6b631f382d7e5fe6c42eba3e1581fad..400a9580db10aa647eb6c0a68d521b4bd998ba4b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1657,7 +1657,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3a6e7e7a71f5fe796e668a24c790abef8b524c6c..45310792113bf32aa5e4c79ff910d1efca292299 100644 +index 8873e947665a877255d92548f7e894f6d8b708f8..e2e8128fc7a88ddf5599e6cb5dc84d5858c062e7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1717,7 +1717,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0135-Fix-stuck-in-portals.patch b/patches/server/0136-Fix-stuck-in-portals.patch similarity index 97% rename from patches/server/0135-Fix-stuck-in-portals.patch rename to patches/server/0136-Fix-stuck-in-portals.patch index ca7ec81f5..15074d550 100644 --- a/patches/server/0135-Fix-stuck-in-portals.patch +++ b/patches/server/0136-Fix-stuck-in-portals.patch @@ -17,7 +17,7 @@ index c65eeec4ee990a1efaf5648ca31f8bb4a178ce2b..4980b0b46e75a4bc914cb3719d8b394f // CraftBukkit end this.setLevel(worldserver); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 45310792113bf32aa5e4c79ff910d1efca292299..6019cb0c18840abc9be0f059e6ee1301b56636b3 100644 +index e2e8128fc7a88ddf5599e6cb5dc84d5858c062e7..42822c44dbe18f1cffb269b35eb554efde59a20d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2865,12 +2865,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0136-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0137-Toggle-for-water-sensitive-mob-damage.patch similarity index 99% rename from patches/server/0136-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0137-Toggle-for-water-sensitive-mob-damage.patch index 3105ec1f3..b2e39964f 100644 --- a/patches/server/0136-Toggle-for-water-sensitive-mob-damage.patch +++ b/patches/server/0137-Toggle-for-water-sensitive-mob-damage.patch @@ -1053,7 +1053,7 @@ index b374069a1e88db67a56d6d5f9e05318c0403d462..dd47abc25f71ad019025e11bdf9f5ca9 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java -index a91ec2e385940b12bc41d9c09819c9081edc5c44..9928af5318c1cc4676c5cf215840ce0f8baf9024 100644 +index 6236a557d2a73dff70141140f79faf851a2062f0..0d8495a73df5b1b6cd2c7e5cf18cb3eb15bbb729 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java @@ -88,6 +88,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { diff --git a/patches/server/0137-Config-to-always-tame-in-Creative.patch b/patches/server/0138-Config-to-always-tame-in-Creative.patch similarity index 100% rename from patches/server/0137-Config-to-always-tame-in-Creative.patch rename to patches/server/0138-Config-to-always-tame-in-Creative.patch diff --git a/patches/server/0138-End-crystal-explosion-options.patch b/patches/server/0139-End-crystal-explosion-options.patch similarity index 100% rename from patches/server/0138-End-crystal-explosion-options.patch rename to patches/server/0139-End-crystal-explosion-options.patch diff --git a/patches/server/0139-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0140-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 100% rename from patches/server/0139-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0140-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch diff --git a/patches/server/0140-Dont-run-with-scissors.patch b/patches/server/0141-Dont-run-with-scissors.patch similarity index 98% rename from patches/server/0140-Dont-run-with-scissors.patch rename to patches/server/0141-Dont-run-with-scissors.patch index a16d34700..0c38082f8 100644 --- a/patches/server/0140-Dont-run-with-scissors.patch +++ b/patches/server/0141-Dont-run-with-scissors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors! diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 11f0e539de92e5b802f722ae1bff2d76d07bd03f..e3e182a5e578a06d7543b78aae8fcfe45eefbcb3 100644 +index 617ecdf362da4e3f5a30645ac3e1e21e76184179..aa41e4aed283297b923985f7ceee914cb62666a9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1627,6 +1627,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0141-One-Punch-Man.patch b/patches/server/0142-One-Punch-Man.patch similarity index 100% rename from patches/server/0141-One-Punch-Man.patch rename to patches/server/0142-One-Punch-Man.patch diff --git a/patches/server/0142-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0143-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 100% rename from patches/server/0142-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0143-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch diff --git a/patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0144-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 100% rename from patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0144-Config-to-ignore-nearby-mobs-when-sleeping.patch diff --git a/patches/server/0144-Add-back-player-spawned-endermite-API.patch b/patches/server/0145-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/server/0144-Add-back-player-spawned-endermite-API.patch rename to patches/server/0145-Add-back-player-spawned-endermite-API.patch diff --git a/patches/server/0145-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0146-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 100% rename from patches/server/0145-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0146-Config-Enderman-aggressiveness-towards-Endermites.patch diff --git a/patches/server/0146-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0147-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 100% rename from patches/server/0146-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0147-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch diff --git a/patches/server/0147-Tick-fluids-config.patch b/patches/server/0148-Tick-fluids-config.patch similarity index 100% rename from patches/server/0147-Tick-fluids-config.patch rename to patches/server/0148-Tick-fluids-config.patch diff --git a/patches/server/0148-Config-to-disable-Llama-caravans.patch b/patches/server/0149-Config-to-disable-Llama-caravans.patch similarity index 100% rename from patches/server/0148-Config-to-disable-Llama-caravans.patch rename to patches/server/0149-Config-to-disable-Llama-caravans.patch diff --git a/patches/server/0149-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0150-Config-to-make-Creepers-explode-on-death.patch similarity index 100% rename from patches/server/0149-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0150-Config-to-make-Creepers-explode-on-death.patch diff --git a/patches/server/0150-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0151-Configurable-ravager-griefable-blocks-list.patch similarity index 100% rename from patches/server/0150-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0151-Configurable-ravager-griefable-blocks-list.patch diff --git a/patches/server/0151-Sneak-to-bulk-process-composter.patch b/patches/server/0152-Sneak-to-bulk-process-composter.patch similarity index 100% rename from patches/server/0151-Sneak-to-bulk-process-composter.patch rename to patches/server/0152-Sneak-to-bulk-process-composter.patch diff --git a/patches/server/0152-Config-for-skipping-night.patch b/patches/server/0153-Config-for-skipping-night.patch similarity index 96% rename from patches/server/0152-Config-for-skipping-night.patch rename to patches/server/0153-Config-for-skipping-night.patch index a4e184988..915c424c9 100644 --- a/patches/server/0152-Config-for-skipping-night.patch +++ b/patches/server/0153-Config-for-skipping-night.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index fd1129945d777746c4579e72f993859c9935a694..1c33d008b1d1d798a18a301a891709d6a656f1a6 100644 +index ce01371b78b995c46d4143c2d177b448720760af..7156ca622cb5233cd9a0bd5fd77b8db0b7b29772 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -625,7 +625,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0153-Add-config-for-villager-trading.patch b/patches/server/0154-Add-config-for-villager-trading.patch similarity index 100% rename from patches/server/0153-Add-config-for-villager-trading.patch rename to patches/server/0154-Add-config-for-villager-trading.patch diff --git a/patches/server/0154-Allow-infinity-on-crossbows.patch b/patches/server/0155-Allow-infinity-on-crossbows.patch similarity index 100% rename from patches/server/0154-Allow-infinity-on-crossbows.patch rename to patches/server/0155-Allow-infinity-on-crossbows.patch diff --git a/patches/server/0155-Drowning-Settings.patch b/patches/server/0156-Drowning-Settings.patch similarity index 97% rename from patches/server/0155-Drowning-Settings.patch rename to patches/server/0156-Drowning-Settings.patch index 06fe5c076..0a59a75b4 100644 --- a/patches/server/0155-Drowning-Settings.patch +++ b/patches/server/0156-Drowning-Settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Drowning Settings diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6019cb0c18840abc9be0f059e6ee1301b56636b3..c988fc2d7fbd8db60ddcde8532dbdf3feda5bd48 100644 +index 42822c44dbe18f1cffb269b35eb554efde59a20d..9a43dd908114f0bb087bf9a2230e4148390df6c0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3096,7 +3096,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0156-Break-individual-slabs-when-sneaking.patch b/patches/server/0157-Break-individual-slabs-when-sneaking.patch similarity index 100% rename from patches/server/0156-Break-individual-slabs-when-sneaking.patch rename to patches/server/0157-Break-individual-slabs-when-sneaking.patch diff --git a/patches/server/0157-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0158-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 100% rename from patches/server/0157-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0158-Config-to-disable-hostile-mob-spawn-on-ice.patch diff --git a/patches/server/0158-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0159-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 100% rename from patches/server/0158-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0159-Config-to-show-Armor-Stand-arms-on-spawn.patch diff --git a/patches/server/0159-Option-to-make-doors-require-redstone.patch b/patches/server/0160-Option-to-make-doors-require-redstone.patch similarity index 100% rename from patches/server/0159-Option-to-make-doors-require-redstone.patch rename to patches/server/0160-Option-to-make-doors-require-redstone.patch diff --git a/patches/server/0160-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0161-Config-to-allow-for-unsafe-enchants.patch similarity index 100% rename from patches/server/0160-Config-to-allow-for-unsafe-enchants.patch rename to patches/server/0161-Config-to-allow-for-unsafe-enchants.patch diff --git a/patches/server/0161-Configurable-sponge-absorption.patch b/patches/server/0162-Configurable-sponge-absorption.patch similarity index 100% rename from patches/server/0161-Configurable-sponge-absorption.patch rename to patches/server/0162-Configurable-sponge-absorption.patch diff --git a/patches/server/0162-Projectile-offset-config.patch b/patches/server/0163-Projectile-offset-config.patch similarity index 100% rename from patches/server/0162-Projectile-offset-config.patch rename to patches/server/0163-Projectile-offset-config.patch diff --git a/patches/server/0163-Config-for-powered-rail-activation-distance.patch b/patches/server/0164-Config-for-powered-rail-activation-distance.patch similarity index 100% rename from patches/server/0163-Config-for-powered-rail-activation-distance.patch rename to patches/server/0164-Config-for-powered-rail-activation-distance.patch diff --git a/patches/server/0164-Piglin-portal-spawn-modifier.patch b/patches/server/0165-Piglin-portal-spawn-modifier.patch similarity index 100% rename from patches/server/0164-Piglin-portal-spawn-modifier.patch rename to patches/server/0165-Piglin-portal-spawn-modifier.patch diff --git a/patches/server/0165-Config-to-change-max-number-of-bees.patch b/patches/server/0166-Config-to-change-max-number-of-bees.patch similarity index 100% rename from patches/server/0165-Config-to-change-max-number-of-bees.patch rename to patches/server/0166-Config-to-change-max-number-of-bees.patch diff --git a/patches/server/0166-Config-for-wither-explosion-radius.patch b/patches/server/0167-Config-for-wither-explosion-radius.patch similarity index 100% rename from patches/server/0166-Config-for-wither-explosion-radius.patch rename to patches/server/0167-Config-for-wither-explosion-radius.patch diff --git a/patches/server/0167-Gamemode-extra-permissions.patch b/patches/server/0168-Gamemode-extra-permissions.patch similarity index 100% rename from patches/server/0167-Gamemode-extra-permissions.patch rename to patches/server/0168-Gamemode-extra-permissions.patch diff --git a/patches/server/0168-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0169-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch similarity index 100% rename from patches/server/0168-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch rename to patches/server/0169-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch diff --git a/patches/server/0169-Configurable-piston-push-limit.patch b/patches/server/0170-Configurable-piston-push-limit.patch similarity index 100% rename from patches/server/0169-Configurable-piston-push-limit.patch rename to patches/server/0170-Configurable-piston-push-limit.patch diff --git a/patches/server/0170-Configurable-broadcast-settings.patch b/patches/server/0171-Configurable-broadcast-settings.patch similarity index 100% rename from patches/server/0170-Configurable-broadcast-settings.patch rename to patches/server/0171-Configurable-broadcast-settings.patch diff --git a/patches/server/0171-Configurable-mob-blindness.patch b/patches/server/0172-Configurable-mob-blindness.patch similarity index 100% rename from patches/server/0171-Configurable-mob-blindness.patch rename to patches/server/0172-Configurable-mob-blindness.patch diff --git a/patches/server/0172-Hide-hidden-players-from-entity-selector.patch b/patches/server/0173-Hide-hidden-players-from-entity-selector.patch similarity index 100% rename from patches/server/0172-Hide-hidden-players-from-entity-selector.patch rename to patches/server/0173-Hide-hidden-players-from-entity-selector.patch diff --git a/patches/server/0173-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0174-Config-for-health-to-impact-Creeper-explosion-radius.patch similarity index 100% rename from patches/server/0173-Config-for-health-to-impact-Creeper-explosion-radius.patch rename to patches/server/0174-Config-for-health-to-impact-Creeper-explosion-radius.patch diff --git a/patches/server/0174-Iron-golem-calm-anger-options.patch b/patches/server/0175-Iron-golem-calm-anger-options.patch similarity index 100% rename from patches/server/0174-Iron-golem-calm-anger-options.patch rename to patches/server/0175-Iron-golem-calm-anger-options.patch diff --git a/patches/server/0175-Breedable-parrots.patch b/patches/server/0176-Breedable-parrots.patch similarity index 100% rename from patches/server/0175-Breedable-parrots.patch rename to patches/server/0176-Breedable-parrots.patch diff --git a/patches/server/0176-Configurable-powered-rail-boost-modifier.patch b/patches/server/0177-Configurable-powered-rail-boost-modifier.patch similarity index 100% rename from patches/server/0176-Configurable-powered-rail-boost-modifier.patch rename to patches/server/0177-Configurable-powered-rail-boost-modifier.patch diff --git a/patches/server/0177-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0178-Add-config-change-multiplier-critical-damage-value.patch similarity index 100% rename from patches/server/0177-Add-config-change-multiplier-critical-damage-value.patch rename to patches/server/0178-Add-config-change-multiplier-critical-damage-value.patch diff --git a/patches/server/0178-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0179-Option-to-disable-dragon-egg-teleporting.patch similarity index 100% rename from patches/server/0178-Option-to-disable-dragon-egg-teleporting.patch rename to patches/server/0179-Option-to-disable-dragon-egg-teleporting.patch diff --git a/patches/server/0179-Config-for-unverified-username-message.patch b/patches/server/0180-Config-for-unverified-username-message.patch similarity index 100% rename from patches/server/0179-Config-for-unverified-username-message.patch rename to patches/server/0180-Config-for-unverified-username-message.patch diff --git a/patches/server/0180-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0181-Make-anvil-cumulative-cost-configurable.patch similarity index 100% rename from patches/server/0180-Make-anvil-cumulative-cost-configurable.patch rename to patches/server/0181-Make-anvil-cumulative-cost-configurable.patch diff --git a/patches/server/0181-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0182-ShulkerBox-allow-oversized-stacks.patch similarity index 100% rename from patches/server/0181-ShulkerBox-allow-oversized-stacks.patch rename to patches/server/0182-ShulkerBox-allow-oversized-stacks.patch diff --git a/patches/server/0182-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0183-Bee-can-work-when-raining-or-at-night.patch similarity index 100% rename from patches/server/0182-Bee-can-work-when-raining-or-at-night.patch rename to patches/server/0183-Bee-can-work-when-raining-or-at-night.patch diff --git a/patches/server/0183-API-for-any-mob-to-burn-daylight.patch b/patches/server/0184-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from patches/server/0183-API-for-any-mob-to-burn-daylight.patch rename to patches/server/0184-API-for-any-mob-to-burn-daylight.patch diff --git a/patches/server/0184-Config-MobEffect-by-world.patch b/patches/server/0185-Config-MobEffect-by-world.patch similarity index 100% rename from patches/server/0184-Config-MobEffect-by-world.patch rename to patches/server/0185-Config-MobEffect-by-world.patch diff --git a/patches/server/0185-Beacon-Activation-Range-Configurable.patch b/patches/server/0186-Beacon-Activation-Range-Configurable.patch similarity index 100% rename from patches/server/0185-Beacon-Activation-Range-Configurable.patch rename to patches/server/0186-Beacon-Activation-Range-Configurable.patch diff --git a/patches/server/0186-Add-toggle-for-sand-duping-fix.patch b/patches/server/0187-Add-toggle-for-sand-duping-fix.patch similarity index 100% rename from patches/server/0186-Add-toggle-for-sand-duping-fix.patch rename to patches/server/0187-Add-toggle-for-sand-duping-fix.patch diff --git a/patches/server/0187-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0188-Add-toggle-for-end-portal-safe-teleporting.patch similarity index 97% rename from patches/server/0187-Add-toggle-for-end-portal-safe-teleporting.patch rename to patches/server/0188-Add-toggle-for-end-portal-safe-teleporting.patch index c5ad616f9..3356fe299 100644 --- a/patches/server/0187-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0188-Add-toggle-for-end-portal-safe-teleporting.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for end portal safe teleporting diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e41a77c86d71f31ff36595b1daa2da1cd94e3a99..0397a5ef8ae2ec074d97055879d46d8e72496da8 100644 +index a28365f60d379cc59edcbbd2c21cf43042bc9659..2f50759e625993e28db857b07975b3c0d9ba2eb0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2916,7 +2916,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0188-Flying-Fall-Damage-API.patch b/patches/server/0189-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/server/0188-Flying-Fall-Damage-API.patch rename to patches/server/0189-Flying-Fall-Damage-API.patch diff --git a/patches/server/0189-Make-lightning-rod-range-configurable.patch b/patches/server/0190-Make-lightning-rod-range-configurable.patch similarity index 96% rename from patches/server/0189-Make-lightning-rod-range-configurable.patch rename to patches/server/0190-Make-lightning-rod-range-configurable.patch index b3e879015..6843532d0 100644 --- a/patches/server/0189-Make-lightning-rod-range-configurable.patch +++ b/patches/server/0190-Make-lightning-rod-range-configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make lightning rod range configurable diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 1c33d008b1d1d798a18a301a891709d6a656f1a6..b21a476816f3fe4affa7162d49ed16c4df165faf 100644 +index 7156ca622cb5233cd9a0bd5fd77b8db0b7b29772..b5d335a0467c6a5674dc3f4b0c33e841ce6ee4f2 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -935,7 +935,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0190-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0191-Burp-after-eating-food-fills-hunger-bar-completely.patch similarity index 100% rename from patches/server/0190-Burp-after-eating-food-fills-hunger-bar-completely.patch rename to patches/server/0191-Burp-after-eating-food-fills-hunger-bar-completely.patch diff --git a/patches/server/0191-Allow-player-join-full-server-by-permission.patch b/patches/server/0192-Allow-player-join-full-server-by-permission.patch similarity index 100% rename from patches/server/0191-Allow-player-join-full-server-by-permission.patch rename to patches/server/0192-Allow-player-join-full-server-by-permission.patch diff --git a/patches/server/0192-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0193-Add-permission-bypass-for-portal-waiting.patch similarity index 94% rename from patches/server/0192-Add-permission-bypass-for-portal-waiting.patch rename to patches/server/0193-Add-permission-bypass-for-portal-waiting.patch index 575ab59e6..a7d18dba2 100644 --- a/patches/server/0192-Add-permission-bypass-for-portal-waiting.patch +++ b/patches/server/0193-Add-permission-bypass-for-portal-waiting.patch @@ -26,7 +26,7 @@ index a4b46199099c654d6fb6373e0cf340dd69bd7bf8..1eb57eeaec24570cade410f40de9e8c2 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 73517e2cc98e9cda6e577976232a6c9314226ece..85ae4f2317a6fa68fcec42cb2a7ff68f9b901a0c 100644 +index 6149e74262ca6c4c00686a89c273c59bfaac3e05..c0c94f76f44cf541bbaaec8bf9cc0a4c1267c19a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -246,6 +246,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0193-Shulker-spawn-from-bullet-options.patch b/patches/server/0194-Shulker-spawn-from-bullet-options.patch similarity index 100% rename from patches/server/0193-Shulker-spawn-from-bullet-options.patch rename to patches/server/0194-Shulker-spawn-from-bullet-options.patch diff --git a/patches/server/0194-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0195-Eating-glow-berries-adds-glow-effect.patch similarity index 100% rename from patches/server/0194-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0195-Eating-glow-berries-adds-glow-effect.patch diff --git a/patches/server/0195-Option-to-make-drowned-break-doors.patch b/patches/server/0196-Option-to-make-drowned-break-doors.patch similarity index 100% rename from patches/server/0195-Option-to-make-drowned-break-doors.patch rename to patches/server/0196-Option-to-make-drowned-break-doors.patch diff --git a/patches/server/0196-Configurable-hunger-starvation-damage.patch b/patches/server/0197-Configurable-hunger-starvation-damage.patch similarity index 100% rename from patches/server/0196-Configurable-hunger-starvation-damage.patch rename to patches/server/0197-Configurable-hunger-starvation-damage.patch diff --git a/patches/server/0197-Enhance-SysoutCatcher.patch b/patches/server/0198-Enhance-SysoutCatcher.patch similarity index 100% rename from patches/server/0197-Enhance-SysoutCatcher.patch rename to patches/server/0198-Enhance-SysoutCatcher.patch diff --git a/patches/server/0198-Armor-click-equip-options.patch b/patches/server/0199-Armor-click-equip-options.patch similarity index 100% rename from patches/server/0198-Armor-click-equip-options.patch rename to patches/server/0199-Armor-click-equip-options.patch diff --git a/patches/server/0199-Add-uptime-command.patch b/patches/server/0200-Add-uptime-command.patch similarity index 98% rename from patches/server/0199-Add-uptime-command.patch rename to patches/server/0200-Add-uptime-command.patch index 4cb0892d3..72bcc2cfa 100644 --- a/patches/server/0199-Add-uptime-command.patch +++ b/patches/server/0200-Add-uptime-command.patch @@ -17,7 +17,7 @@ index c6a97b3fa04c683a92a8d838f98e73b59bb7558a..2fbb65c685ac88c77d54f27a5981a132 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 85c7da8849a3976bd214a822c780b447ada5f727..00d3fca3906d59bf8c840f0773cd59b72d355e84 100644 +index 6c593bf7c0ab8f70470705c4210ade11714c4bcc..db39fd89be32f2f3d4d38b8e633f50a40bdd0235 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -278,6 +278,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop type) { -- return (boolean)type == EntityType.OCELOT || type == EntityType.PARROT; -+ return type == EntityType.OCELOT || type == EntityType.PARROT; // Purpur - decompile fix - } - - private static BedBlock bed(DyeColor color) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 7aa7e6ccbe65b49a29f1938c4fd3c17ce7c24aac..d92a9d187fea8afc1ea0453addda99cd715c034e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java diff --git a/patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0228-Shift-right-click-to-use-exp-for-mending.patch similarity index 98% rename from patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch rename to patches/server/0228-Shift-right-click-to-use-exp-for-mending.patch index e06fefb3d..35910a52a 100644 --- a/patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0228-Shift-right-click-to-use-exp-for-mending.patch @@ -36,7 +36,7 @@ index 5204b8157a45468a314bbcd2703896b9316128ac..4fb8ced22cb9f106fbe39ca233a844a7 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e3e182a5e578a06d7543b78aae8fcfe45eefbcb3..13da39f5bbd3550961bfb7d462428e8dac988ad0 100644 +index aa41e4aed283297b923985f7ceee914cb62666a9..4d61504698a54af354fdf047426f87771397cc02 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1999,6 +1999,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0228-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0229-Dolphins-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0228-Dolphins-naturally-aggressive-to-players-chance.patch rename to patches/server/0229-Dolphins-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0229-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0230-Cows-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0229-Cows-naturally-aggressive-to-players-chance.patch rename to patches/server/0230-Cows-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0230-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0231-Option-for-beds-to-explode-on-villager-sleep.patch similarity index 100% rename from patches/server/0230-Option-for-beds-to-explode-on-villager-sleep.patch rename to patches/server/0231-Option-for-beds-to-explode-on-villager-sleep.patch diff --git a/patches/server/0231-Halloween-options-and-optimizations.patch b/patches/server/0232-Halloween-options-and-optimizations.patch similarity index 100% rename from patches/server/0231-Halloween-options-and-optimizations.patch rename to patches/server/0232-Halloween-options-and-optimizations.patch diff --git a/patches/server/0232-Config-for-grindstones.patch b/patches/server/0233-Config-for-grindstones.patch similarity index 100% rename from patches/server/0232-Config-for-grindstones.patch rename to patches/server/0233-Config-for-grindstones.patch diff --git a/patches/server/0233-UPnP-Port-Forwarding.patch b/patches/server/0234-UPnP-Port-Forwarding.patch similarity index 97% rename from patches/server/0233-UPnP-Port-Forwarding.patch rename to patches/server/0234-UPnP-Port-Forwarding.patch index 699689f24..9716ce066 100644 --- a/patches/server/0233-UPnP-Port-Forwarding.patch +++ b/patches/server/0234-UPnP-Port-Forwarding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 00d3fca3906d59bf8c840f0773cd59b72d355e84..39e3d848a1c5955d4de25d91eff427595c131e25 100644 +index db39fd89be32f2f3d4d38b8e633f50a40bdd0235..b728506e933461bec663d5187e7c71ee2ba2acc3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -293,6 +293,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop