From d2c5e6b5e5dce6848d1a5af22a61d943d213df65 Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich Date: Mon, 21 Nov 2022 23:36:41 -0500 Subject: [PATCH] fix compile issues --- patches/server/0038-Cows-eat-mushrooms.patch | 4 ++-- ...ble-chance-for-wolves-to-spawn-rabid.patch | 4 ++-- patches/server/0209-Add-compass-command.patch | 6 ++--- .../0275-Skeletons-eat-wither-roses.patch | 4 ++-- ...atch => 0296-Allay-respect-item-NBT.patch} | 0 patches/server/0296-Fix-MC-179072.patch | 24 ------------------- ....patch => 0297-Add-death-screen-API.patch} | 0 ...8-Implement-ram-and-rambar-commands.patch} | 2 +- ...299-Add-item-packet-serialize-event.patch} | 0 ...-123848.patch => 0300-Fix-MC-123848.patch} | 0 ...quid-colors-for-rainglow-fabric-mod.patch} | 0 ...n-to-fix-MC-3304-projectile-looting.patch} | 0 ...Configurable-block-blast-resistance.patch} | 0 ...gurable-block-fall-damage-modifiers.patch} | 0 ...uage-API.patch => 0305-Language-API.patch} | 2 +- ... 0306-Milk-Keeps-Beneficial-Effects.patch} | 4 ++-- ...s-not-looking-up-and-down-when-stra.patch} | 0 ...d-log-suppression-for-LibraryLoader.patch} | 0 ...ransparent-Blocks-In-Enchanting-Box.patch} | 0 ...ow-creeper-to-encircle-target-when-.patch} | 4 ++-- ...API.patch => 0311-Fire-Immunity-API.patch} | 2 +- ...eport-to-spawn-on-nether-ceiling-da.patch} | 0 ...t.patch => 0313-Added-got-ram-event.patch} | 0 23 files changed, 16 insertions(+), 40 deletions(-) rename patches/server/{0297-Allay-respect-item-NBT.patch => 0296-Allay-respect-item-NBT.patch} (100%) delete mode 100644 patches/server/0296-Fix-MC-179072.patch rename patches/server/{0298-Add-death-screen-API.patch => 0297-Add-death-screen-API.patch} (100%) rename patches/server/{0299-Implement-ram-and-rambar-commands.patch => 0298-Implement-ram-and-rambar-commands.patch} (99%) rename patches/server/{0300-Add-item-packet-serialize-event.patch => 0299-Add-item-packet-serialize-event.patch} (100%) rename patches/server/{0301-Fix-MC-123848.patch => 0300-Fix-MC-123848.patch} (100%) rename patches/server/{0302-Implement-squid-colors-for-rainglow-fabric-mod.patch => 0301-Implement-squid-colors-for-rainglow-fabric-mod.patch} (100%) rename patches/server/{0303-Add-an-option-to-fix-MC-3304-projectile-looting.patch => 0302-Add-an-option-to-fix-MC-3304-projectile-looting.patch} (100%) rename patches/server/{0304-Configurable-block-blast-resistance.patch => 0303-Configurable-block-blast-resistance.patch} (100%) rename patches/server/{0305-Configurable-block-fall-damage-modifiers.patch => 0304-Configurable-block-fall-damage-modifiers.patch} (100%) rename patches/server/{0306-Language-API.patch => 0305-Language-API.patch} (94%) rename patches/server/{0307-Milk-Keeps-Beneficial-Effects.patch => 0306-Milk-Keeps-Beneficial-Effects.patch} (95%) rename patches/server/{0308-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch => 0307-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch} (100%) rename patches/server/{0309-Add-log-suppression-for-LibraryLoader.patch => 0308-Add-log-suppression-for-LibraryLoader.patch} (100%) rename patches/server/{0310-Allow-Transparent-Blocks-In-Enchanting-Box.patch => 0309-Allow-Transparent-Blocks-In-Enchanting-Box.patch} (100%) rename patches/server/{0311-Add-option-to-allow-creeper-to-encircle-target-when-.patch => 0310-Add-option-to-allow-creeper-to-encircle-target-when-.patch} (94%) rename patches/server/{0312-Fire-Immunity-API.patch => 0311-Fire-Immunity-API.patch} (97%) rename patches/server/{0313-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch => 0312-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch} (100%) rename patches/server/{0314-Added-got-ram-event.patch => 0313-Added-got-ram-event.patch} (100%) diff --git a/patches/server/0038-Cows-eat-mushrooms.patch b/patches/server/0038-Cows-eat-mushrooms.patch index 8be59c91e..a5332c364 100644 --- a/patches/server/0038-Cows-eat-mushrooms.patch +++ b/patches/server/0038-Cows-eat-mushrooms.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cows eat mushrooms diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java -index b6af466d454ca7d4c0277d2d1db0e23b50677418..123aae4d17bc06317c872270e229f6e9c13953e1 100644 +index b6af466d454ca7d4c0277d2d1db0e23b50677418..00bb7f8f8bc3b1369aec7b139745cf3c47b9f0f6 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java @@ -1,6 +1,7 @@ @@ -102,7 +102,7 @@ index b6af466d454ca7d4c0277d2d1db0e23b50677418..123aae4d17bc06317c872270e229f6e9 + stack.shrink(1); + } + for (int i = 0; i < 15; ++i) { -+ ((ServerLevel) level).sendParticles(((ServerLevel) level).players, null, ParticleTypes.HAPPY_VILLAGER, ++ ((ServerLevel) level).sendParticles(((ServerLevel) level).players(), null, ParticleTypes.HAPPY_VILLAGER, + getX() + random.nextFloat(), getY() + (random.nextFloat() * 2), getZ() + random.nextFloat(), 1, + random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, 0, true); + } diff --git a/patches/server/0120-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0120-Configurable-chance-for-wolves-to-spawn-rabid.patch index ea4577d04..bfad29109 100644 --- a/patches/server/0120-Configurable-chance-for-wolves-to-spawn-rabid.patch +++ b/patches/server/0120-Configurable-chance-for-wolves-to-spawn-rabid.patch @@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid. Rabid wolves attack all players, mobs, and animals. diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java -index 28e35304e76b26af734fcfbccef8f43143345576..f862d83db6127804b9254a33a73e6f186a1d1327 100644 +index 28e35304e76b26af734fcfbccef8f43143345576..b0ea5dda197b6ca88e5d80c16a9007a4abc3c7ac 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java @@ -10,6 +10,7 @@ import net.minecraft.network.syncher.EntityDataAccessor; @@ -190,7 +190,7 @@ index 28e35304e76b26af734fcfbccef8f43143345576..f862d83db6127804b9254a33a73e6f18 + } + this.setRabid(false); + for (int i = 0; i < 10; ++i) { -+ ((ServerLevel) level).sendParticles(((ServerLevel) level).players, null, ParticleTypes.HAPPY_VILLAGER, ++ ((ServerLevel) level).sendParticles(((ServerLevel) level).players(), null, ParticleTypes.HAPPY_VILLAGER, + getX() + random.nextFloat(), getY() + (random.nextFloat() * 1.5), getZ() + random.nextFloat(), 1, + random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, 0, true); + } diff --git a/patches/server/0209-Add-compass-command.patch b/patches/server/0209-Add-compass-command.patch index fb7ed2084..442b9f7a2 100644 --- a/patches/server/0209-Add-compass-command.patch +++ b/patches/server/0209-Add-compass-command.patch @@ -17,7 +17,7 @@ index 6a044a9c97db9bba75f8dbbaa8515e3167841855..edd378813873ed367784379b0f1666d1 if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 5d90bae91c95617fa39ec3eb643c664cc0123bd8..5229555d9e1114e739641c6e5b07ef2ddc97a252 100644 +index 81f7653c098b6964daff37b7e0482964c3d301a0..30b10c9e034a4f683d0aaabfbe8a4aa07c5f2b77 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -264,6 +264,7 @@ public class ServerPlayer extends Player { @@ -174,7 +174,7 @@ index d38b3c4a722396cc3b61a9a8ed7e39cea4ae65cb..d333334f323049ca97e756324cff0b23 } diff --git a/src/main/java/org/purpurmc/purpur/task/CompassTask.java b/src/main/java/org/purpurmc/purpur/task/CompassTask.java new file mode 100644 -index 0000000000000000000000000000000000000000..5c06909e343f06b00816fcf227c7080aec8057ce +index 0000000000000000000000000000000000000000..bece7eefc8ba8822b433835526251d2fb916c025 --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/task/CompassTask.java @@ -0,0 +1,68 @@ @@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..5c06909e343f06b00816fcf227c7080a + + MinecraftServer.getServer().getAllLevels().forEach((level) -> { + if (level.purpurConfig.compassItemShowsBossBar) { -+ level.players.forEach(player -> { ++ level.players().forEach(player -> { + if (!player.compassBar()) { + if (player.getMainHandItem().getItem() != Items.COMPASS && player.getOffhandItem().getItem() != Items.COMPASS) { + removePlayer(player.getBukkitEntity()); diff --git a/patches/server/0275-Skeletons-eat-wither-roses.patch b/patches/server/0275-Skeletons-eat-wither-roses.patch index 752ab2837..e64614c0f 100644 --- a/patches/server/0275-Skeletons-eat-wither-roses.patch +++ b/patches/server/0275-Skeletons-eat-wither-roses.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Skeletons eat wither roses diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java -index 51c548cd84bd83624fbff3f853a8050dc1e71ecd..a5ab36fdd0751cb3b96525d53bbaec33878b2af7 100644 +index 51c548cd84bd83624fbff3f853a8050dc1e71ecd..2c85d71cfb486d30cb58b3378ebcdf55e18423fd 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java +++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java @@ -14,6 +14,16 @@ import net.minecraft.world.item.Items; @@ -85,7 +85,7 @@ index 51c548cd84bd83624fbff3f853a8050dc1e71ecd..a5ab36fdd0751cb3b96525d53bbaec33 + } + + for (int i = 0; i < 15; ++i) { -+ ((ServerLevel) level).sendParticles(((ServerLevel) level).players, null, ParticleTypes.HAPPY_VILLAGER, ++ ((ServerLevel) level).sendParticles(((ServerLevel) level).players(), null, ParticleTypes.HAPPY_VILLAGER, + getX() + random.nextFloat(), getY() + (random.nextFloat() * 2), getZ() + random.nextFloat(), 1, + random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, 0, true); + } diff --git a/patches/server/0297-Allay-respect-item-NBT.patch b/patches/server/0296-Allay-respect-item-NBT.patch similarity index 100% rename from patches/server/0297-Allay-respect-item-NBT.patch rename to patches/server/0296-Allay-respect-item-NBT.patch diff --git a/patches/server/0296-Fix-MC-179072.patch b/patches/server/0296-Fix-MC-179072.patch deleted file mode 100644 index fd0d36977..000000000 --- a/patches/server/0296-Fix-MC-179072.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Tue, 6 Sep 2022 13:29:14 -0500 -Subject: [PATCH] Fix MC-179072 - - -diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java -index e241ae250f4f04a17ef2c583d00b065a4ca56a4c..77ba04d270abc87460f09730887aa8079b7cf8d3 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java -+++ b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java -@@ -28,6 +28,13 @@ public class SwellGoal extends Goal { - } - // Paper end - -+ // Purpur start -+ @Override -+ public boolean canContinueToUse() { -+ return !net.minecraft.world.entity.EntitySelector.NO_CREATIVE_OR_SPECTATOR.test(this.creeper.getTarget()) && canUse(); -+ } -+ // Purpur end -+ - @Override - public void start() { - this.creeper.getNavigation().stop(); diff --git a/patches/server/0298-Add-death-screen-API.patch b/patches/server/0297-Add-death-screen-API.patch similarity index 100% rename from patches/server/0298-Add-death-screen-API.patch rename to patches/server/0297-Add-death-screen-API.patch diff --git a/patches/server/0299-Implement-ram-and-rambar-commands.patch b/patches/server/0298-Implement-ram-and-rambar-commands.patch similarity index 99% rename from patches/server/0299-Implement-ram-and-rambar-commands.patch rename to patches/server/0298-Implement-ram-and-rambar-commands.patch index 3ad0345b7..5771355f5 100644 --- a/patches/server/0299-Implement-ram-and-rambar-commands.patch +++ b/patches/server/0298-Implement-ram-and-rambar-commands.patch @@ -18,7 +18,7 @@ index eb4dac2239592d680ef31edf47f1ab660299762d..1b956c3f50750a00eaf7851112004115 if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 7917c6d10136cc16f95821a6e2f508f3f3c79ad2..14b2c36049c91a8abfc545e2fb5e3d6f908370e8 100644 +index d4bebb739d8ff19a610be6775ee25ede4bce2a8c..2fb0398fa693a0ce0d298c15426d4b592e69195e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -263,6 +263,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0300-Add-item-packet-serialize-event.patch b/patches/server/0299-Add-item-packet-serialize-event.patch similarity index 100% rename from patches/server/0300-Add-item-packet-serialize-event.patch rename to patches/server/0299-Add-item-packet-serialize-event.patch diff --git a/patches/server/0301-Fix-MC-123848.patch b/patches/server/0300-Fix-MC-123848.patch similarity index 100% rename from patches/server/0301-Fix-MC-123848.patch rename to patches/server/0300-Fix-MC-123848.patch diff --git a/patches/server/0302-Implement-squid-colors-for-rainglow-fabric-mod.patch b/patches/server/0301-Implement-squid-colors-for-rainglow-fabric-mod.patch similarity index 100% rename from patches/server/0302-Implement-squid-colors-for-rainglow-fabric-mod.patch rename to patches/server/0301-Implement-squid-colors-for-rainglow-fabric-mod.patch diff --git a/patches/server/0303-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0302-Add-an-option-to-fix-MC-3304-projectile-looting.patch similarity index 100% rename from patches/server/0303-Add-an-option-to-fix-MC-3304-projectile-looting.patch rename to patches/server/0302-Add-an-option-to-fix-MC-3304-projectile-looting.patch diff --git a/patches/server/0304-Configurable-block-blast-resistance.patch b/patches/server/0303-Configurable-block-blast-resistance.patch similarity index 100% rename from patches/server/0304-Configurable-block-blast-resistance.patch rename to patches/server/0303-Configurable-block-blast-resistance.patch diff --git a/patches/server/0305-Configurable-block-fall-damage-modifiers.patch b/patches/server/0304-Configurable-block-fall-damage-modifiers.patch similarity index 100% rename from patches/server/0305-Configurable-block-fall-damage-modifiers.patch rename to patches/server/0304-Configurable-block-fall-damage-modifiers.patch diff --git a/patches/server/0306-Language-API.patch b/patches/server/0305-Language-API.patch similarity index 94% rename from patches/server/0306-Language-API.patch rename to patches/server/0305-Language-API.patch index afe534a57..192601241 100644 --- a/patches/server/0306-Language-API.patch +++ b/patches/server/0305-Language-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Language API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 43b9d766a592d58b304c375a23173538f0e3959b..2491785f5edd782b74189bef33eeffe13288f3da 100644 +index 9883c5732cb136194c5d11fbe76f66fd234e3f82..ed7e59b4d573ea9124a086708ca84f755861c896 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -238,6 +238,7 @@ import org.bukkit.scoreboard.Criteria; diff --git a/patches/server/0307-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0306-Milk-Keeps-Beneficial-Effects.patch similarity index 95% rename from patches/server/0307-Milk-Keeps-Beneficial-Effects.patch rename to patches/server/0306-Milk-Keeps-Beneficial-Effects.patch index ef200523e..ef08553e6 100644 --- a/patches/server/0307-Milk-Keeps-Beneficial-Effects.patch +++ b/patches/server/0306-Milk-Keeps-Beneficial-Effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Milk Keeps Beneficial Effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2de1d338267dc69fdd509abe50145996dc9cd35a..1ec9a48f2f44f5bd647e0661423ae90970aee262 100644 +index d0c8c39ff78637de14bfdfef78d74f4035bfb6a4..61a162007b1773ca707d88972d0fcda2c98c5614 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1095,6 +1095,7 @@ public abstract class LivingEntity extends Entity { @@ -17,7 +17,7 @@ index 2de1d338267dc69fdd509abe50145996dc9cd35a..1ec9a48f2f44f5bd647e0661423ae909 if (event.isCancelled()) { continue; diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index 18e3589a46daa3fc0abf7e6f8bfdc18670edd315..d87c7138c50f90a772bb52448d7e33b907a448e2 100644 +index 558884b68263f4fd89e5b7e6226faa2b268168da..cdbd13212b366d9601d4b100fde43cefb5c9cf6f 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java @@ -110,7 +110,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill diff --git a/patches/server/0308-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0307-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch similarity index 100% rename from patches/server/0308-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch rename to patches/server/0307-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch diff --git a/patches/server/0309-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0308-Add-log-suppression-for-LibraryLoader.patch similarity index 100% rename from patches/server/0309-Add-log-suppression-for-LibraryLoader.patch rename to patches/server/0308-Add-log-suppression-for-LibraryLoader.patch diff --git a/patches/server/0310-Allow-Transparent-Blocks-In-Enchanting-Box.patch b/patches/server/0309-Allow-Transparent-Blocks-In-Enchanting-Box.patch similarity index 100% rename from patches/server/0310-Allow-Transparent-Blocks-In-Enchanting-Box.patch rename to patches/server/0309-Allow-Transparent-Blocks-In-Enchanting-Box.patch diff --git a/patches/server/0311-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0310-Add-option-to-allow-creeper-to-encircle-target-when-.patch similarity index 94% rename from patches/server/0311-Add-option-to-allow-creeper-to-encircle-target-when-.patch rename to patches/server/0310-Add-option-to-allow-creeper-to-encircle-target-when-.patch index 4946f6824..acd864742 100644 --- a/patches/server/0311-Add-option-to-allow-creeper-to-encircle-target-when-.patch +++ b/patches/server/0310-Add-option-to-allow-creeper-to-encircle-target-when-.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to allow creeper to encircle target when fusing. diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java -index 77ba04d270abc87460f09730887aa8079b7cf8d3..5d1964bd66443f1b4ade1632e4673fea6824d828 100644 +index e241ae250f4f04a17ef2c583d00b065a4ca56a4c..02b567e4e808e1a809d285ef39e1abc54e1e6ad2 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java -@@ -61,6 +61,14 @@ public class SwellGoal extends Goal { +@@ -54,6 +54,14 @@ public class SwellGoal extends Goal { this.creeper.setSwellDir(-1); } else { this.creeper.setSwellDir(1); diff --git a/patches/server/0312-Fire-Immunity-API.patch b/patches/server/0311-Fire-Immunity-API.patch similarity index 97% rename from patches/server/0312-Fire-Immunity-API.patch rename to patches/server/0311-Fire-Immunity-API.patch index d148c4158..54d137d89 100644 --- a/patches/server/0312-Fire-Immunity-API.patch +++ b/patches/server/0311-Fire-Immunity-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fire Immunity API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 30cbbdd312d7cc34db7b281524adb5aa7563746b..967647c7dc0a4c2d762e7133fe969106f7d8ecba 100644 +index 6c8a5126c45aec13dc881a1998bdbb0f11bb9688..9f3a065a24d2e8cc2ea7ae307545af013fdbbf1b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -398,6 +398,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0313-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0312-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch similarity index 100% rename from patches/server/0313-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch rename to patches/server/0312-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch diff --git a/patches/server/0314-Added-got-ram-event.patch b/patches/server/0313-Added-got-ram-event.patch similarity index 100% rename from patches/server/0314-Added-got-ram-event.patch rename to patches/server/0313-Added-got-ram-event.patch