From d652384e4a440513bb431b03a9a364b6969e6129 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 10 Oct 2020 16:41:13 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: 1c446c22 Fix CME when adding a passenger during Spawn events (#4616) f3927b25 Fix "Not a string" Map Conversion spam - Fixes #3901 1b64536b Clarify the JavaDocs for Entity.getEntitySpawnReason() in response to #4361 6b22219c Remove unnecessary space for provided plugins, fixes #4608 3ece9036 [CI-SKIP] [Auto] Rebuild Patches 551fac7e Fix deop kicking non-whitelisted player when white list is not enabled faf8eb03 Updated Upstream (CraftBukkit) (#4622) --- Paper | 2 +- current-paper | 2 +- ... => 0095-ALlow-color-codes-in-books.patch} | 2 +- ...op-kicking-non-whitelisted-player-wh.patch | 19 ------------------- ...espan.patch => 0096-Entity-lifespan.patch} | 6 +++--- ...eport-to-spawn-if-outside-world-bor.patch} | 4 ++-- ...ty.patch => 0098-Squid-EAR-immunity.patch} | 0 ...=> 0099-Configurable-end-spike-seed.patch} | 4 ++-- ...h => 0100-Configurable-dungeon-seed.patch} | 4 ++-- ...atch => 0101-Phantoms-burn-in-light.patch} | 0 ...0102-Configurable-villager-breeding.patch} | 0 ... 0103-Redstone-deactivates-spawners.patch} | 0 ...ch => 0104-Totems-work-in-inventory.patch} | 4 ++-- ...ch => 0105-Fix-death-message-colors.patch} | 2 +- ...-vanilla-scoreboard-colors-patch-to.patch} | 2 +- ...tch => 0107-Populator-seed-controls.patch} | 6 +++--- ...-Add-vindicator-johnny-spawn-chance.patch} | 4 ++-- ...t.patch => 0109-DragonEggPlaceEvent.patch} | 2 +- ...n-to-disable-mushroom-block-updates.patch} | 4 ++-- ...0111-Dispensers-place-anvils-option.patch} | 6 +++--- ...rs.patch => 0112-Allow-anvil-colors.patch} | 4 ++-- ...atch => 0113-Add-no-tick-block-list.patch} | 6 +++--- ...-disable-dolphin-treasure-searching.patch} | 0 ...et-reputation-when-villager-is-cure.patch} | 0 ...patch => 0116-Short-enderman-height.patch} | 6 +++--- ...top-squids-floating-on-top-of-water.patch} | 2 +- ...119-Ridables.patch => 0118-Ridables.patch} | 2 +- ...-height-for-nether-surface-builders.patch} | 2 +- ...ng-obsidian-valid-for-portal-frames.patch} | 8 ++++---- ...ities-can-use-portals-configuration.patch} | 4 ++-- ...122-LivingEntity-broadcastItemBreak.patch} | 2 +- ...zable-WitherBoss-Health-and-Healing.patch} | 0 ...gling-special-MobSpawners-per-world.patch} | 6 +++--- ...patch => 0125-Raid-cooldown-setting.patch} | 2 +- ...-config-options-per-projectile-type.patch} | 2 +- ...-Wandering-Trader-spawn-rate-config.patch} | 0 ...olor-code-support-for-console-loggi.patch} | 2 +- ...able-zombie-aggressiveness-towards-.patch} | 0 ...ent-TileEntity-Lore-and-DisplayName.patch} | 2 +- ...-to-recipe-s-ExactChoice-ingredient.patch} | 0 ...y.patch => 0132-Flying-squids-Oh-my.patch} | 0 ...patch => 0133-Infinity-bow-settings.patch} | 0 ...ge.patch => 0134-Stonecutter-damage.patch} | 0 ...=> 0135-Configurable-daylight-cycle.patch} | 0 44 files changed, 52 insertions(+), 71 deletions(-) rename patches/server/{0096-ALlow-color-codes-in-books.patch => 0095-ALlow-color-codes-in-books.patch} (98%) delete mode 100644 patches/server/0095-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch rename patches/server/{0097-Entity-lifespan.patch => 0096-Entity-lifespan.patch} (97%) rename patches/server/{0098-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch => 0097-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch} (96%) rename patches/server/{0099-Squid-EAR-immunity.patch => 0098-Squid-EAR-immunity.patch} (100%) rename patches/server/{0100-Configurable-end-spike-seed.patch => 0099-Configurable-end-spike-seed.patch} (97%) rename patches/server/{0101-Configurable-dungeon-seed.patch => 0100-Configurable-dungeon-seed.patch} (97%) rename patches/server/{0102-Phantoms-burn-in-light.patch => 0101-Phantoms-burn-in-light.patch} (100%) rename patches/server/{0103-Configurable-villager-breeding.patch => 0102-Configurable-villager-breeding.patch} (100%) rename patches/server/{0104-Redstone-deactivates-spawners.patch => 0103-Redstone-deactivates-spawners.patch} (100%) rename patches/server/{0105-Totems-work-in-inventory.patch => 0104-Totems-work-in-inventory.patch} (96%) rename patches/server/{0106-Fix-death-message-colors.patch => 0105-Fix-death-message-colors.patch} (98%) rename patches/server/{0107-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch => 0106-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch} (98%) rename patches/server/{0108-Populator-seed-controls.patch => 0107-Populator-seed-controls.patch} (98%) rename patches/server/{0109-Add-vindicator-johnny-spawn-chance.patch => 0108-Add-vindicator-johnny-spawn-chance.patch} (96%) rename patches/server/{0110-DragonEggPlaceEvent.patch => 0109-DragonEggPlaceEvent.patch} (97%) rename patches/server/{0111-Add-option-to-disable-mushroom-block-updates.patch => 0110-Add-option-to-disable-mushroom-block-updates.patch} (99%) rename patches/server/{0112-Dispensers-place-anvils-option.patch => 0111-Dispensers-place-anvils-option.patch} (97%) rename patches/server/{0113-Allow-anvil-colors.patch => 0112-Allow-anvil-colors.patch} (97%) rename patches/server/{0114-Add-no-tick-block-list.patch => 0113-Add-no-tick-block-list.patch} (97%) rename patches/server/{0115-Add-option-to-disable-dolphin-treasure-searching.patch => 0114-Add-option-to-disable-dolphin-treasure-searching.patch} (100%) rename patches/server/{0116-Add-option-to-reset-reputation-when-villager-is-cure.patch => 0115-Add-option-to-reset-reputation-when-villager-is-cure.patch} (100%) rename patches/server/{0117-Short-enderman-height.patch => 0116-Short-enderman-height.patch} (97%) rename patches/server/{0118-Stop-squids-floating-on-top-of-water.patch => 0117-Stop-squids-floating-on-top-of-water.patch} (98%) rename patches/server/{0119-Ridables.patch => 0118-Ridables.patch} (99%) rename patches/server/{0120-Use-configured-height-for-nether-surface-builders.patch => 0119-Use-configured-height-for-nether-surface-builders.patch} (97%) rename patches/server/{0121-Crying-obsidian-valid-for-portal-frames.patch => 0120-Crying-obsidian-valid-for-portal-frames.patch} (95%) rename patches/server/{0122-Entities-can-use-portals-configuration.patch => 0121-Entities-can-use-portals-configuration.patch} (97%) rename patches/server/{0123-LivingEntity-broadcastItemBreak.patch => 0122-LivingEntity-broadcastItemBreak.patch} (96%) rename patches/server/{0124-Customizable-WitherBoss-Health-and-Healing.patch => 0123-Customizable-WitherBoss-Health-and-Healing.patch} (100%) rename patches/server/{0125-Allow-toggling-special-MobSpawners-per-world.patch => 0124-Allow-toggling-special-MobSpawners-per-world.patch} (98%) rename patches/server/{0126-Raid-cooldown-setting.patch => 0125-Raid-cooldown-setting.patch} (99%) rename patches/server/{0127-Despawn-rate-config-options-per-projectile-type.patch => 0126-Despawn-rate-config-options-per-projectile-type.patch} (99%) rename patches/server/{0128-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch => 0127-PaperPR-Add-Wandering-Trader-spawn-rate-config.patch} (100%) rename patches/server/{0129-PaperPR-Add-hex-color-code-support-for-console-loggi.patch => 0128-PaperPR-Add-hex-color-code-support-for-console-loggi.patch} (98%) rename patches/server/{0130-Add-option-to-disable-zombie-aggressiveness-towards-.patch => 0129-Add-option-to-disable-zombie-aggressiveness-towards-.patch} (100%) rename patches/server/{0131-Persistent-TileEntity-Lore-and-DisplayName.patch => 0130-Persistent-TileEntity-Lore-and-DisplayName.patch} (99%) rename patches/server/{0132-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch => 0131-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch} (100%) rename patches/server/{0133-Flying-squids-Oh-my.patch => 0132-Flying-squids-Oh-my.patch} (100%) rename patches/server/{0134-Infinity-bow-settings.patch => 0133-Infinity-bow-settings.patch} (100%) rename patches/server/{0135-Stonecutter-damage.patch => 0134-Stonecutter-damage.patch} (100%) rename patches/server/{0136-Configurable-daylight-cycle.patch => 0135-Configurable-daylight-cycle.patch} (100%) diff --git a/Paper b/Paper index d62bab6e2..1c446c222 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit d62bab6e2591e2bc99220a5f79339d5253b043d2 +Subproject commit 1c446c222d0930bbce88cb45ee9fd9234c49d266 diff --git a/current-paper b/current-paper index f9cb66a78..268dd4a37 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.3--bfe85e2507e6b326b22182b30415805d94ec620f +1.16.3--9472fd3116e17e8d344bb53186a61f7bac7ca5c7 diff --git a/patches/server/0096-ALlow-color-codes-in-books.patch b/patches/server/0095-ALlow-color-codes-in-books.patch similarity index 98% rename from patches/server/0096-ALlow-color-codes-in-books.patch rename to patches/server/0095-ALlow-color-codes-in-books.patch index 6143454da..5fabd553b 100644 --- a/patches/server/0096-ALlow-color-codes-in-books.patch +++ b/patches/server/0095-ALlow-color-codes-in-books.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ALlow color codes in books diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3a7014d30..f3e2b6e6e 100644 +index 668bd7261c..de3d692084 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -937,12 +937,13 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0095-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch b/patches/server/0095-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch deleted file mode 100644 index 86c11eb6c..000000000 --- a/patches/server/0095-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Tue, 7 Jul 2020 14:31:12 -0500 -Subject: [PATCH] MC-171420 - Fix deop kicking non-whitelisted player when - white list is not enabled - - -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 21d0f3d45..4b67c3d2f 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1962,6 +1962,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant list = Lists.newArrayList(playerlist.getPlayers()); - Iterator iterator = list.iterator(); - diff --git a/patches/server/0097-Entity-lifespan.patch b/patches/server/0096-Entity-lifespan.patch similarity index 97% rename from patches/server/0097-Entity-lifespan.patch rename to patches/server/0096-Entity-lifespan.patch index 1841f4017..1a2946f30 100644 --- a/patches/server/0097-Entity-lifespan.patch +++ b/patches/server/0096-Entity-lifespan.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index fc1a1bc74..0ecc5bd28 100644 +index 78ee45767a..7465e867ba 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -53,7 +53,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -92,7 +92,7 @@ index fc1a1bc74..0ecc5bd28 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f3e2b6e6e..ff4a45777 100644 +index de3d692084..f7a4ced160 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2132,6 +2132,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -104,7 +104,7 @@ index f3e2b6e6e..ff4a45777 100644 event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND); } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4f1998d7e..6279d6bb1 100644 +index c0314fd6e1..de98b45cfa 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -101,6 +101,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0098-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0097-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 96% rename from patches/server/0098-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0097-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 4f5c3ec23..87cedeb94 100644 --- a/patches/server/0098-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0097-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 11abe8a93..2e4859709 100644 +index 45a2979380..ca70050ce0 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -278,6 +278,13 @@ public abstract class EntityLiving extends Entity { @@ -23,7 +23,7 @@ index 11abe8a93..2e4859709 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6279d6bb1..a04e2f9d3 100644 +index de98b45cfa..5a38ee5bd9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -180,6 +180,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0099-Squid-EAR-immunity.patch b/patches/server/0098-Squid-EAR-immunity.patch similarity index 100% rename from patches/server/0099-Squid-EAR-immunity.patch rename to patches/server/0098-Squid-EAR-immunity.patch diff --git a/patches/server/0100-Configurable-end-spike-seed.patch b/patches/server/0099-Configurable-end-spike-seed.patch similarity index 97% rename from patches/server/0100-Configurable-end-spike-seed.patch rename to patches/server/0099-Configurable-end-spike-seed.patch index ded623eaf..0e5da80f8 100644 --- a/patches/server/0100-Configurable-end-spike-seed.patch +++ b/patches/server/0099-Configurable-end-spike-seed.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end spike seed diff --git a/src/main/java/net/minecraft/server/WorldGenEnder.java b/src/main/java/net/minecraft/server/WorldGenEnder.java -index 00a170720..5eb9b3d35 100644 +index 00a1707209..5eb9b3d35e 100644 --- a/src/main/java/net/minecraft/server/WorldGenEnder.java +++ b/src/main/java/net/minecraft/server/WorldGenEnder.java @@ -23,12 +23,14 @@ public class WorldGenEnder extends WorldGenerator list = worldgenfeatureendspikeconfiguration.c(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 9d5246de9..fa6298719 100644 +index 9d5246de95..fa62987191 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0101-Configurable-dungeon-seed.patch b/patches/server/0100-Configurable-dungeon-seed.patch similarity index 97% rename from patches/server/0101-Configurable-dungeon-seed.patch rename to patches/server/0100-Configurable-dungeon-seed.patch index 9787b7ed4..45144bf25 100644 --- a/patches/server/0101-Configurable-dungeon-seed.patch +++ b/patches/server/0100-Configurable-dungeon-seed.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable dungeon seed diff --git a/src/main/java/net/minecraft/server/WorldGenDungeons.java b/src/main/java/net/minecraft/server/WorldGenDungeons.java -index 07f7b69fe..6aa1626f3 100644 +index 07f7b69fef..6aa1626f38 100644 --- a/src/main/java/net/minecraft/server/WorldGenDungeons.java +++ b/src/main/java/net/minecraft/server/WorldGenDungeons.java @@ -11,12 +11,21 @@ public class WorldGenDungeons extends WorldGenerator(this, (fluidtype) -> { return fluidtype == null || fluidtype == FluidTypes.EMPTY; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6d1bb8f3e..fd100a9cc 100644 +index 10cefd8547..0a9d75e82a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -11,8 +11,10 @@ import org.bukkit.configuration.ConfigurationSection; diff --git a/patches/server/0115-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0114-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 100% rename from patches/server/0115-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0114-Add-option-to-disable-dolphin-treasure-searching.patch diff --git a/patches/server/0116-Add-option-to-reset-reputation-when-villager-is-cure.patch b/patches/server/0115-Add-option-to-reset-reputation-when-villager-is-cure.patch similarity index 100% rename from patches/server/0116-Add-option-to-reset-reputation-when-villager-is-cure.patch rename to patches/server/0115-Add-option-to-reset-reputation-when-villager-is-cure.patch diff --git a/patches/server/0117-Short-enderman-height.patch b/patches/server/0116-Short-enderman-height.patch similarity index 97% rename from patches/server/0117-Short-enderman-height.patch rename to patches/server/0116-Short-enderman-height.patch index a65ff4024..7416f2cdf 100644 --- a/patches/server/0117-Short-enderman-height.patch +++ b/patches/server/0116-Short-enderman-height.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Short enderman height diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index b45a75a45..fde60d6c8 100644 +index b45a75a451..fde60d6c89 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -321,6 +321,7 @@ public class EntityEnderman extends EntityMonster implements IEntityAngerable { @@ -17,7 +17,7 @@ index b45a75a45..fde60d6c8 100644 if (this.tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start for (int i = 0; i < 64; ++i) { diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index c03b0b58b..e52b23fa7 100644 +index b089c8a3f1..7e55134410 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -34,7 +34,7 @@ public class EntityTypes { @@ -30,7 +30,7 @@ index c03b0b58b..e52b23fa7 100644 public static final EntityTypes EVOKER = a("evoker", EntityTypes.Builder.a(EntityEvoker::new, EnumCreatureType.MONSTER).a(0.6F, 1.95F).trackingRange(8)); public static final EntityTypes EVOKER_FANGS = a("evoker_fangs", EntityTypes.Builder.a(EntityEvokerFangs::new, EnumCreatureType.MISC).a(0.5F, 0.8F).trackingRange(6).updateInterval(2)); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index bef137935..8714d1574 100644 +index bef1379357..8714d1574d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -190,6 +190,11 @@ public class PurpurConfig { diff --git a/patches/server/0118-Stop-squids-floating-on-top-of-water.patch b/patches/server/0117-Stop-squids-floating-on-top-of-water.patch similarity index 98% rename from patches/server/0118-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0117-Stop-squids-floating-on-top-of-water.patch index 172a5b364..666bf0340 100644 --- a/patches/server/0118-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0117-Stop-squids-floating-on-top-of-water.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d7ac23524a..b1c7231bbe 100644 +index 08ceba1559..2b2911ca8e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -3417,8 +3417,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/patches/server/0119-Ridables.patch b/patches/server/0118-Ridables.patch similarity index 99% rename from patches/server/0119-Ridables.patch rename to patches/server/0118-Ridables.patch index 4632c83ff..57833dc61 100644 --- a/patches/server/0119-Ridables.patch +++ b/patches/server/0118-Ridables.patch @@ -161,7 +161,7 @@ index bd0267ee4b..8b36ac2b09 100644 this.B = true; return this; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b1c7231bbe..e2de67783c 100644 +index 2b2911ca8e..48cd541912 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/patches/server/0120-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0119-Use-configured-height-for-nether-surface-builders.patch similarity index 97% rename from patches/server/0120-Use-configured-height-for-nether-surface-builders.patch rename to patches/server/0119-Use-configured-height-for-nether-surface-builders.patch index 3557fecd5..e384c6093 100644 --- a/patches/server/0120-Use-configured-height-for-nether-surface-builders.patch +++ b/patches/server/0119-Use-configured-height-for-nether-surface-builders.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use configured height for nether surface builders diff --git a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java -index 462f0b2ba..f418a71ca 100644 +index 462f0b2bae..f418a71ca8 100644 --- a/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java +++ b/src/main/java/net/minecraft/server/WorldGenSurfaceNetherAbstract.java @@ -35,7 +35,7 @@ public abstract class WorldGenSurfaceNetherAbstract extends WorldGenSurface