diff --git a/patches/server/0005-Add-component-util.patch b/patches/server/0005-Add-component-util.patch new file mode 100644 index 000000000..bdfc4dbfa --- /dev/null +++ b/patches/server/0005-Add-component-util.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Sat, 15 Aug 2020 03:49:33 -0500 +Subject: [PATCH] Add component util + + +diff --git a/src/main/java/net/pl3x/purpur/ComponentUtil.java b/src/main/java/net/pl3x/purpur/ComponentUtil.java +new file mode 100644 +index 000000000..3f7bc68d1 +--- /dev/null ++++ b/src/main/java/net/pl3x/purpur/ComponentUtil.java +@@ -0,0 +1,32 @@ ++package net.pl3x.purpur; ++ ++import net.md_5.bungee.api.chat.BaseComponent; ++import net.md_5.bungee.api.chat.TextComponent; ++import net.md_5.bungee.chat.ComponentSerializer; ++import net.minecraft.server.IChatBaseComponent; ++import net.minecraft.server.MinecraftServer; ++ ++import java.util.List; ++ ++public class ComponentUtil { ++ public static String fromComponent(IChatBaseComponent component) { ++ String json = ""; ++ try { ++ int chop; ++ List siblings = component.getSiblings(); ++ if (siblings.size() > 0) chop = siblings.get(0).getChatModifier().getColor() == null ? 4 : 2; ++ else chop = component.getChatModifier().getColor() == null ? 2 : 0; ++ json = IChatBaseComponent.ChatSerializer.componentToJson(component); ++ BaseComponent[] parsed = ComponentSerializer.parse(json); ++ return TextComponent.toLegacyText(parsed).substring(chop); ++ } catch (Exception e) { ++ MinecraftServer.LOGGER.warn("There was a problem processing a chat component!"); ++ MinecraftServer.LOGGER.warn("We have fallen back to legacy colorless string to prevent real errors"); ++ MinecraftServer.LOGGER.warn("Please report this to Purpur!"); ++ MinecraftServer.LOGGER.warn("JSON: " + json); ++ MinecraftServer.LOGGER.warn("The following error describes what went wrong:"); ++ e.printStackTrace(); ++ return component.getString(); ++ } ++ } ++} diff --git a/patches/server/0005-Barrels-and-enderchests-6-rows.patch b/patches/server/0006-Barrels-and-enderchests-6-rows.patch similarity index 97% rename from patches/server/0005-Barrels-and-enderchests-6-rows.patch rename to patches/server/0006-Barrels-and-enderchests-6-rows.patch index bbebce32c..3924bebad 100644 --- a/patches/server/0005-Barrels-and-enderchests-6-rows.patch +++ b/patches/server/0006-Barrels-and-enderchests-6-rows.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Barrels and enderchests 6 rows diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java -index af2819bb83..73ab299a40 100644 +index 896d99d40..9ab8336df 100644 --- a/src/main/java/net/minecraft/server/BlockEnderChest.java +++ b/src/main/java/net/minecraft/server/BlockEnderChest.java @@ -48,6 +48,27 @@ public class BlockEnderChest extends BlockChestAbstract im @@ -37,7 +37,7 @@ index af2819bb83..73ab299a40 100644 }, BlockEnderChest.e)); entityhuman.a(StatisticList.OPEN_ENDERCHEST); diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java -index bf8c5436b6..d147377e5d 100644 +index bf8c5436b..d147377e5 100644 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java @@ -20,7 +20,7 @@ public class InventoryEnderChest extends InventorySubcontainer { @@ -50,7 +50,7 @@ index bf8c5436b6..d147377e5d 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java -index f70faa39a8..1d2c8aef9c 100644 +index c5551a9e9..03bde6067 100644 --- a/src/main/java/net/minecraft/server/TileEntityBarrel.java +++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java @@ -55,7 +55,7 @@ public class TileEntityBarrel extends TileEntityLootable { @@ -80,7 +80,7 @@ index f70faa39a8..1d2c8aef9c 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 1d00832bff..803a7ff92a 100644 +index 1d00832bf..803a7ff92 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -7,6 +7,7 @@ import org.bukkit.Bukkit; @@ -121,7 +121,7 @@ index 1d00832bff..803a7ff92a 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java -index 8c714c7430..cae362bae9 100644 +index 8c714c743..cae362bae 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java @@ -198,8 +198,10 @@ public class CraftContainer extends Container { @@ -137,7 +137,7 @@ index 8c714c7430..cae362bae9 100644 case DISPENSER: case DROPPER: diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java -index 7266313482..a451000340 100644 +index 726631348..a45100034 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -81,7 +81,7 @@ public class CraftInventory implements Inventory { diff --git a/patches/server/0006-Advancement-API.patch b/patches/server/0007-Advancement-API.patch similarity index 97% rename from patches/server/0006-Advancement-API.patch rename to patches/server/0007-Advancement-API.patch index 1172feb7e..0b42baf83 100644 --- a/patches/server/0006-Advancement-API.patch +++ b/patches/server/0007-Advancement-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Advancement API diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java -index c405047c..384d4090 100644 +index c405047c0..384d4090f 100644 --- a/src/main/java/net/minecraft/server/Advancement.java +++ b/src/main/java/net/minecraft/server/Advancement.java @@ -64,7 +64,7 @@ public class Advancement { @@ -18,7 +18,7 @@ index c405047c..384d4090 100644 } diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java -index b0d4b7a6..ac4fac89 100644 +index b0d4b7a67..ac4fac898 100644 --- a/src/main/java/net/minecraft/server/AdvancementDisplay.java +++ b/src/main/java/net/minecraft/server/AdvancementDisplay.java @@ -15,10 +15,11 @@ public class AdvancementDisplay { @@ -66,7 +66,7 @@ index b0d4b7a6..ac4fac89 100644 return this.h; } diff --git a/src/main/java/net/minecraft/server/AdvancementFrameType.java b/src/main/java/net/minecraft/server/AdvancementFrameType.java -index 90b78e49..9a3a53cf 100644 +index 90b78e49c..9a3a53cf3 100644 --- a/src/main/java/net/minecraft/server/AdvancementFrameType.java +++ b/src/main/java/net/minecraft/server/AdvancementFrameType.java @@ -1,15 +1,26 @@ @@ -99,7 +99,7 @@ index 90b78e49..9a3a53cf 100644 this.e = i; this.f = enumchatformat; diff --git a/src/main/java/net/minecraft/server/CriterionTrigger.java b/src/main/java/net/minecraft/server/CriterionTrigger.java -index cfb420a9..6fd3671c 100644 +index cfb420a9c..6fd3671c3 100644 --- a/src/main/java/net/minecraft/server/CriterionTrigger.java +++ b/src/main/java/net/minecraft/server/CriterionTrigger.java @@ -26,6 +26,7 @@ public interface CriterionTrigger { @@ -111,7 +111,7 @@ index cfb420a9..6fd3671c 100644 return this.a; } diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java -index a5aadf28..b0a7092d 100644 +index a5aadf285..b0a7092d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java @@ -27,4 +27,11 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement { @@ -128,7 +128,7 @@ index a5aadf28..b0a7092d 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java new file mode 100644 -index 00000000..1cbb1e67 +index 000000000..1cbb1e67b --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java @@ -0,0 +1,47 @@ diff --git a/patches/server/0007-Llama-API.patch b/patches/server/0008-Llama-API.patch similarity index 98% rename from patches/server/0007-Llama-API.patch rename to patches/server/0008-Llama-API.patch index b248a3ff2..5ef126192 100644 --- a/patches/server/0007-Llama-API.patch +++ b/patches/server/0008-Llama-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Llama API diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index d4175f2d..e90ff597 100644 +index d4175f2da..e90ff597d 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -13,7 +13,8 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -73,7 +73,7 @@ index d4175f2d..e90ff597 100644 } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java -index 1b29ca2c..47ffa669 100644 +index 1b29ca2ca..47ffa6696 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java @@ -6,7 +6,7 @@ import java.util.List; @@ -102,7 +102,7 @@ index 1b29ca2c..47ffa669 100644 double d0 = this.a.h((Entity) this.a.fD()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java -index 3f94c5a9..a0276348 100644 +index 3f94c5a92..a02763480 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java @@ -65,4 +65,48 @@ public class CraftLlama extends CraftChestedHorse implements Llama, CraftRangedE diff --git a/patches/server/0008-Evoker-API.patch b/patches/server/0009-Evoker-API.patch similarity index 100% rename from patches/server/0008-Evoker-API.patch rename to patches/server/0009-Evoker-API.patch diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0010-AFK-API.patch similarity index 99% rename from patches/server/0009-AFK-API.patch rename to patches/server/0010-AFK-API.patch index 2a9675e1e..449a55863 100644 --- a/patches/server/0009-AFK-API.patch +++ b/patches/server/0010-AFK-API.patch @@ -193,7 +193,7 @@ index d32f423c5..6c1438f7d 100644 if (from.getX() != Double.MAX_VALUE) { Location oldTo = to.clone(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 92646b86b..eaf13fb15 100644 +index abc6b6548..5cc5b609c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -843,7 +843,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0010-Bring-back-server-name.patch b/patches/server/0011-Bring-back-server-name.patch similarity index 100% rename from patches/server/0010-Bring-back-server-name.patch rename to patches/server/0011-Bring-back-server-name.patch diff --git a/patches/server/0011-Configurable-server-mod-name.patch b/patches/server/0012-Configurable-server-mod-name.patch similarity index 100% rename from patches/server/0011-Configurable-server-mod-name.patch rename to patches/server/0012-Configurable-server-mod-name.patch diff --git a/patches/server/0012-LivingEntity-safeFallDistance.patch b/patches/server/0013-LivingEntity-safeFallDistance.patch similarity index 100% rename from patches/server/0012-LivingEntity-safeFallDistance.patch rename to patches/server/0013-LivingEntity-safeFallDistance.patch diff --git a/patches/server/0013-MoonPhase-API.patch b/patches/server/0014-MoonPhase-API.patch similarity index 100% rename from patches/server/0013-MoonPhase-API.patch rename to patches/server/0014-MoonPhase-API.patch diff --git a/patches/server/0014-Lagging-threshold.patch b/patches/server/0015-Lagging-threshold.patch similarity index 100% rename from patches/server/0014-Lagging-threshold.patch rename to patches/server/0015-Lagging-threshold.patch diff --git a/patches/server/0015-ItemFactory-getMonsterEgg.patch b/patches/server/0016-ItemFactory-getMonsterEgg.patch similarity index 98% rename from patches/server/0015-ItemFactory-getMonsterEgg.patch rename to patches/server/0016-ItemFactory-getMonsterEgg.patch index 0b7c15217..5763256e2 100644 --- a/patches/server/0015-ItemFactory-getMonsterEgg.patch +++ b/patches/server/0016-ItemFactory-getMonsterEgg.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemFactory#getMonsterEgg diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java -index 6d8321080..793e42072 100644 +index 76c585299..f543bd84f 100644 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java @@ -9,7 +9,7 @@ import javax.annotation.Nullable; diff --git a/patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch similarity index 100% rename from patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch rename to patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch diff --git a/patches/server/0017-EMC-MonsterEggSpawnEvent.patch b/patches/server/0018-EMC-MonsterEggSpawnEvent.patch similarity index 100% rename from patches/server/0017-EMC-MonsterEggSpawnEvent.patch rename to patches/server/0018-EMC-MonsterEggSpawnEvent.patch diff --git a/patches/server/0018-Villager-resetOffers.patch b/patches/server/0019-Villager-resetOffers.patch similarity index 100% rename from patches/server/0018-Villager-resetOffers.patch rename to patches/server/0019-Villager-resetOffers.patch diff --git a/patches/server/0019-LivingEntity-playPickupItemAnimation.patch b/patches/server/0020-LivingEntity-playPickupItemAnimation.patch similarity index 100% rename from patches/server/0019-LivingEntity-playPickupItemAnimation.patch rename to patches/server/0020-LivingEntity-playPickupItemAnimation.patch diff --git a/patches/server/0020-SkeletonHorseTrapEvent-getPlayer.patch b/patches/server/0021-SkeletonHorseTrapEvent-getPlayer.patch similarity index 100% rename from patches/server/0020-SkeletonHorseTrapEvent-getPlayer.patch rename to patches/server/0021-SkeletonHorseTrapEvent-getPlayer.patch diff --git a/patches/server/0021-PaperPR-PlayerItemCooldownEvent.patch b/patches/server/0022-PaperPR-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0021-PaperPR-PlayerItemCooldownEvent.patch rename to patches/server/0022-PaperPR-PlayerItemCooldownEvent.patch diff --git a/patches/server/0022-EntityMoveEvent.patch b/patches/server/0023-EntityMoveEvent.patch similarity index 100% rename from patches/server/0022-EntityMoveEvent.patch rename to patches/server/0023-EntityMoveEvent.patch diff --git a/patches/server/0023-PaperPR-Add-BellRingEvent.patch b/patches/server/0024-PaperPR-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0023-PaperPR-Add-BellRingEvent.patch rename to patches/server/0024-PaperPR-Add-BellRingEvent.patch diff --git a/patches/server/0024-Player-invulnerabilities.patch b/patches/server/0025-Player-invulnerabilities.patch similarity index 100% rename from patches/server/0024-Player-invulnerabilities.patch rename to patches/server/0025-Player-invulnerabilities.patch diff --git a/patches/server/0025-Anvil-API.patch b/patches/server/0026-Anvil-API.patch similarity index 100% rename from patches/server/0025-Anvil-API.patch rename to patches/server/0026-Anvil-API.patch diff --git a/patches/server/0026-Configurable-villager-brain-ticks.patch b/patches/server/0027-Configurable-villager-brain-ticks.patch similarity index 100% rename from patches/server/0026-Configurable-villager-brain-ticks.patch rename to patches/server/0027-Configurable-villager-brain-ticks.patch diff --git a/patches/server/0027-Alternative-Keepalive-Handling.patch b/patches/server/0028-Alternative-Keepalive-Handling.patch similarity index 100% rename from patches/server/0027-Alternative-Keepalive-Handling.patch rename to patches/server/0028-Alternative-Keepalive-Handling.patch diff --git a/patches/server/0028-Silk-touch-spawners.patch b/patches/server/0029-Silk-touch-spawners.patch similarity index 100% rename from patches/server/0028-Silk-touch-spawners.patch rename to patches/server/0029-Silk-touch-spawners.patch diff --git a/patches/server/0029-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0030-MC-168772-Fix-Add-turtle-egg-block-options.patch similarity index 100% rename from patches/server/0029-MC-168772-Fix-Add-turtle-egg-block-options.patch rename to patches/server/0030-MC-168772-Fix-Add-turtle-egg-block-options.patch diff --git a/patches/server/0030-MC-4-Fix-Item-position-desync.patch b/patches/server/0031-MC-4-Fix-Item-position-desync.patch similarity index 100% rename from patches/server/0030-MC-4-Fix-Item-position-desync.patch rename to patches/server/0031-MC-4-Fix-Item-position-desync.patch diff --git a/patches/server/0031-Fix-vanilla-command-permission-handler.patch b/patches/server/0032-Fix-vanilla-command-permission-handler.patch similarity index 100% rename from patches/server/0031-Fix-vanilla-command-permission-handler.patch rename to patches/server/0032-Fix-vanilla-command-permission-handler.patch diff --git a/patches/server/0032-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch similarity index 100% rename from patches/server/0032-Logger-settings-suppressing-pointless-logs.patch rename to patches/server/0033-Logger-settings-suppressing-pointless-logs.patch diff --git a/patches/server/0033-Disable-outdated-build-check.patch b/patches/server/0034-Disable-outdated-build-check.patch similarity index 100% rename from patches/server/0033-Disable-outdated-build-check.patch rename to patches/server/0034-Disable-outdated-build-check.patch diff --git a/patches/server/0034-Giants-AI-settings.patch b/patches/server/0035-Giants-AI-settings.patch similarity index 100% rename from patches/server/0034-Giants-AI-settings.patch rename to patches/server/0035-Giants-AI-settings.patch diff --git a/patches/server/0035-Illusioners-AI-settings.patch b/patches/server/0036-Illusioners-AI-settings.patch similarity index 100% rename from patches/server/0035-Illusioners-AI-settings.patch rename to patches/server/0036-Illusioners-AI-settings.patch diff --git a/patches/server/0036-Zombie-horse-naturally-spawn.patch b/patches/server/0037-Zombie-horse-naturally-spawn.patch similarity index 98% rename from patches/server/0036-Zombie-horse-naturally-spawn.patch rename to patches/server/0037-Zombie-horse-naturally-spawn.patch index f2cec09a4..2ac061de3 100644 --- a/patches/server/0036-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0037-Zombie-horse-naturally-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index eaf13fb15..18e8e36d7 100644 +index 5cc5b609c..699a03a9e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1053,12 +1053,18 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0037-Charged-creeper-naturally-spawn.patch b/patches/server/0038-Charged-creeper-naturally-spawn.patch similarity index 100% rename from patches/server/0037-Charged-creeper-naturally-spawn.patch rename to patches/server/0038-Charged-creeper-naturally-spawn.patch diff --git a/patches/server/0038-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0039-Rabbit-naturally-spawn-toast-and-killer.patch similarity index 100% rename from patches/server/0038-Rabbit-naturally-spawn-toast-and-killer.patch rename to patches/server/0039-Rabbit-naturally-spawn-toast-and-killer.patch diff --git a/patches/server/0039-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0039-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0040-Make-Iron-Golems-Swim.patch b/patches/server/0041-Make-Iron-Golems-Swim.patch similarity index 100% rename from patches/server/0040-Make-Iron-Golems-Swim.patch rename to patches/server/0041-Make-Iron-Golems-Swim.patch diff --git a/patches/server/0041-Dont-send-useless-entity-packets.patch b/patches/server/0042-Dont-send-useless-entity-packets.patch similarity index 100% rename from patches/server/0041-Dont-send-useless-entity-packets.patch rename to patches/server/0042-Dont-send-useless-entity-packets.patch diff --git a/patches/server/0042-Tulips-change-fox-type.patch b/patches/server/0043-Tulips-change-fox-type.patch similarity index 100% rename from patches/server/0042-Tulips-change-fox-type.patch rename to patches/server/0043-Tulips-change-fox-type.patch diff --git a/patches/server/0043-Breedable-Polar-Bears.patch b/patches/server/0044-Breedable-Polar-Bears.patch similarity index 100% rename from patches/server/0043-Breedable-Polar-Bears.patch rename to patches/server/0044-Breedable-Polar-Bears.patch diff --git a/patches/server/0044-Chickens-can-retaliate.patch b/patches/server/0045-Chickens-can-retaliate.patch similarity index 100% rename from patches/server/0044-Chickens-can-retaliate.patch rename to patches/server/0045-Chickens-can-retaliate.patch diff --git a/patches/server/0045-Add-option-to-set-armorstand-step-height.patch b/patches/server/0046-Add-option-to-set-armorstand-step-height.patch similarity index 100% rename from patches/server/0045-Add-option-to-set-armorstand-step-height.patch rename to patches/server/0046-Add-option-to-set-armorstand-step-height.patch diff --git a/patches/server/0046-Cat-spawning-options.patch b/patches/server/0047-Cat-spawning-options.patch similarity index 99% rename from patches/server/0046-Cat-spawning-options.patch rename to patches/server/0047-Cat-spawning-options.patch index 08a2676f4..136229f09 100644 --- a/patches/server/0046-Cat-spawning-options.patch +++ b/patches/server/0047-Cat-spawning-options.patch @@ -95,7 +95,7 @@ index a5718af9b..b6b4c8c49 100644 return this.E; } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 18e8e36d7..17105c9a1 100644 +index 699a03a9e..004cc8616 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -2530,6 +2530,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0047-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0048-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch similarity index 100% rename from patches/server/0047-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch rename to patches/server/0048-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch diff --git a/patches/server/0048-Cows-eat-mushrooms.patch b/patches/server/0049-Cows-eat-mushrooms.patch similarity index 100% rename from patches/server/0048-Cows-eat-mushrooms.patch rename to patches/server/0049-Cows-eat-mushrooms.patch diff --git a/patches/server/0049-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0050-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0049-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0050-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0050-Pigs-give-saddle-back.patch b/patches/server/0051-Pigs-give-saddle-back.patch similarity index 100% rename from patches/server/0050-Pigs-give-saddle-back.patch rename to patches/server/0051-Pigs-give-saddle-back.patch diff --git a/patches/server/0051-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0052-Snowman-drop-and-put-back-pumpkin.patch similarity index 100% rename from patches/server/0051-Snowman-drop-and-put-back-pumpkin.patch rename to patches/server/0052-Snowman-drop-and-put-back-pumpkin.patch diff --git a/patches/server/0052-Ender-dragon-always-drop-egg.patch b/patches/server/0053-Ender-dragon-always-drop-egg.patch similarity index 100% rename from patches/server/0052-Ender-dragon-always-drop-egg.patch rename to patches/server/0053-Ender-dragon-always-drop-egg.patch diff --git a/patches/server/0053-Ender-dragon-always-drop-full-exp.patch b/patches/server/0054-Ender-dragon-always-drop-full-exp.patch similarity index 100% rename from patches/server/0053-Ender-dragon-always-drop-full-exp.patch rename to patches/server/0054-Ender-dragon-always-drop-full-exp.patch diff --git a/patches/server/0054-Signs-editable-on-right-click.patch b/patches/server/0055-Signs-editable-on-right-click.patch similarity index 100% rename from patches/server/0054-Signs-editable-on-right-click.patch rename to patches/server/0055-Signs-editable-on-right-click.patch diff --git a/patches/server/0055-Signs-allow-color-codes.patch b/patches/server/0056-Signs-allow-color-codes.patch similarity index 76% rename from patches/server/0055-Signs-allow-color-codes.patch rename to patches/server/0056-Signs-allow-color-codes.patch index 87041de69..b0c5adaa6 100644 --- a/patches/server/0055-Signs-allow-color-codes.patch +++ b/patches/server/0056-Signs-allow-color-codes.patch @@ -5,17 +5,17 @@ Subject: [PATCH] Signs allow color codes diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2738194fc..eaca7b445 100644 +index 2738194fc..66e786b25 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1245,6 +1245,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1243,6 +1243,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { + + @Override public void openSign(TileEntitySign tileentitysign) { ++ if (world.purpurConfig.signAllowColors) this.playerConnection.sendPacket(tileentitysign.getTranslatedUpdatePacket()); // Purpur tileentitysign.a((EntityHuman) this); this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition())); -+ if (world.purpurConfig.signAllowColors) this.playerConnection.sendPacket(tileentitysign.getTranslatedUpdatePacket()); // Purpur } - - public int nextContainerCounter() { // CraftBukkit - void -> int diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index a01b80327..c9798d775 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java @@ -36,25 +36,10 @@ index a01b80327..c9798d775 100644 } SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 316766970..db81ee600 100644 +index 316766970..852bb5db8 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java -@@ -1,6 +1,14 @@ - package net.minecraft.server; - - import com.mojang.brigadier.exceptions.CommandSyntaxException; -+import net.md_5.bungee.api.chat.BaseComponent; -+import net.md_5.bungee.api.chat.TextComponent; -+import net.md_5.bungee.chat.BaseComponentSerializer; -+import net.md_5.bungee.chat.ComponentSerializer; -+import net.md_5.bungee.chat.TextComponentSerializer; -+import org.bukkit.craftbukkit.util.CraftChatMessage; -+ -+import java.util.List; - import java.util.UUID; - import javax.annotation.Nullable; - -@@ -93,6 +101,21 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // +@@ -93,6 +93,18 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // this.g[i] = null; } @@ -62,11 +47,8 @@ index 316766970..db81ee600 100644 + public PacketPlayOutTileEntityData getTranslatedUpdatePacket() { + NBTTagCompound nbt = save(new NBTTagCompound()); + for (int i = 0; i < 4; ++i) { -+ String line = CraftChatMessage.fromComponent(lines[i]).replace("\u00a7", "&"); -+ if (line.endsWith("&r")) { -+ line = line.substring(0, line.length() - 2); -+ } -+ nbt.setString("Text" + (i + 1), CraftChatMessage.toJSON(CraftChatMessage.fromString(line)[0])); ++ String line = net.pl3x.purpur.ComponentUtil.fromComponent(lines[i]).replace("\u00a7", "&"); ++ nbt.setString("Text" + (i + 1), IChatBaseComponent.ChatSerializer.componentToJson(org.bukkit.craftbukkit.util.CraftChatMessage.fromString(line)[0])); + } + nbt.setString("PurpurEditor", "true"); + return new PacketPlayOutTileEntityData(position, 9, nbt); diff --git a/patches/server/0056-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0057-Allow-soil-to-moisten-from-water-directly-under-it.patch similarity index 100% rename from patches/server/0056-Allow-soil-to-moisten-from-water-directly-under-it.patch rename to patches/server/0057-Allow-soil-to-moisten-from-water-directly-under-it.patch diff --git a/patches/server/0057-Controllable-Minecarts.patch b/patches/server/0058-Controllable-Minecarts.patch similarity index 100% rename from patches/server/0057-Controllable-Minecarts.patch rename to patches/server/0058-Controllable-Minecarts.patch diff --git a/patches/server/0058-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0059-Disable-loot-drops-on-death-by-cramming.patch similarity index 100% rename from patches/server/0058-Disable-loot-drops-on-death-by-cramming.patch rename to patches/server/0059-Disable-loot-drops-on-death-by-cramming.patch diff --git a/patches/server/0059-Players-should-not-cram-to-death.patch b/patches/server/0060-Players-should-not-cram-to-death.patch similarity index 96% rename from patches/server/0059-Players-should-not-cram-to-death.patch rename to patches/server/0060-Players-should-not-cram-to-death.patch index d00e1cee7..8bdfab745 100644 --- a/patches/server/0059-Players-should-not-cram-to-death.patch +++ b/patches/server/0060-Players-should-not-cram-to-death.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Players should not cram to death diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index eaca7b445..869ba9679 100644 +index 66e786b25..47f48d3b7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1219,7 +1219,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0060-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0061-Option-to-toggle-milk-curing-bad-omen.patch similarity index 100% rename from patches/server/0060-Option-to-toggle-milk-curing-bad-omen.patch rename to patches/server/0061-Option-to-toggle-milk-curing-bad-omen.patch diff --git a/patches/server/0061-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0062-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0061-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0062-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0062-Debug-stick-should-not-update-neighbors.patch b/patches/server/0063-Debug-stick-should-not-update-neighbors.patch similarity index 100% rename from patches/server/0062-Debug-stick-should-not-update-neighbors.patch rename to patches/server/0063-Debug-stick-should-not-update-neighbors.patch diff --git a/patches/server/0063-Fix-reloading-paper.yml.patch b/patches/server/0064-Fix-reloading-paper.yml.patch similarity index 100% rename from patches/server/0063-Fix-reloading-paper.yml.patch rename to patches/server/0064-Fix-reloading-paper.yml.patch diff --git a/patches/server/0064-Fix-the-dead-lagging-the-server.patch b/patches/server/0065-Fix-the-dead-lagging-the-server.patch similarity index 100% rename from patches/server/0064-Fix-the-dead-lagging-the-server.patch rename to patches/server/0065-Fix-the-dead-lagging-the-server.patch diff --git a/patches/server/0065-Skip-events-if-there-s-no-listeners.patch b/patches/server/0066-Skip-events-if-there-s-no-listeners.patch similarity index 100% rename from patches/server/0065-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0066-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0066-Add-permission-for-F3-N-debug.patch b/patches/server/0067-Add-permission-for-F3-N-debug.patch similarity index 100% rename from patches/server/0066-Add-permission-for-F3-N-debug.patch rename to patches/server/0067-Add-permission-for-F3-N-debug.patch diff --git a/patches/server/0067-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0068-Add-wither-skeleton-takes-wither-damage-option.patch similarity index 100% rename from patches/server/0067-Add-wither-skeleton-takes-wither-damage-option.patch rename to patches/server/0068-Add-wither-skeleton-takes-wither-damage-option.patch diff --git a/patches/server/0068-Configurable-TPS-Catchup.patch b/patches/server/0069-Configurable-TPS-Catchup.patch similarity index 100% rename from patches/server/0068-Configurable-TPS-Catchup.patch rename to patches/server/0069-Configurable-TPS-Catchup.patch diff --git a/patches/server/0069-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0070-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch similarity index 100% rename from patches/server/0069-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch rename to patches/server/0070-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch diff --git a/patches/server/0070-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0071-Add-enderman-and-creeper-griefing-controls.patch similarity index 100% rename from patches/server/0070-Add-enderman-and-creeper-griefing-controls.patch rename to patches/server/0071-Add-enderman-and-creeper-griefing-controls.patch diff --git a/patches/server/0071-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0072-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch similarity index 100% rename from patches/server/0071-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch rename to patches/server/0072-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch diff --git a/patches/server/0072-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0073-Villagers-farming-can-bypass-mob-griefing-gamerule.patch similarity index 100% rename from patches/server/0072-Villagers-farming-can-bypass-mob-griefing-gamerule.patch rename to patches/server/0073-Villagers-farming-can-bypass-mob-griefing-gamerule.patch diff --git a/patches/server/0073-Villagers-follow-emerald-blocks.patch b/patches/server/0074-Villagers-follow-emerald-blocks.patch similarity index 100% rename from patches/server/0073-Villagers-follow-emerald-blocks.patch rename to patches/server/0074-Villagers-follow-emerald-blocks.patch diff --git a/patches/server/0074-Allow-leashing-villagers.patch b/patches/server/0075-Allow-leashing-villagers.patch similarity index 100% rename from patches/server/0074-Allow-leashing-villagers.patch rename to patches/server/0075-Allow-leashing-villagers.patch diff --git a/patches/server/0075-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0076-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0075-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0076-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0076-Implement-infinite-lava.patch b/patches/server/0077-Implement-infinite-lava.patch similarity index 100% rename from patches/server/0076-Implement-infinite-lava.patch rename to patches/server/0077-Implement-infinite-lava.patch diff --git a/patches/server/0077-Make-lava-flow-speed-configurable.patch b/patches/server/0078-Make-lava-flow-speed-configurable.patch similarity index 100% rename from patches/server/0077-Make-lava-flow-speed-configurable.patch rename to patches/server/0078-Make-lava-flow-speed-configurable.patch diff --git a/patches/server/0078-Add-player-death-exp-control-options.patch b/patches/server/0079-Add-player-death-exp-control-options.patch similarity index 100% rename from patches/server/0078-Add-player-death-exp-control-options.patch rename to patches/server/0079-Add-player-death-exp-control-options.patch diff --git a/patches/server/0079-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch similarity index 100% rename from patches/server/0079-Add-option-to-disable-saving-projectiles-to-disk.patch rename to patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch diff --git a/patches/server/0080-Configurable-void-damage-height.patch b/patches/server/0081-Configurable-void-damage-height.patch similarity index 100% rename from patches/server/0080-Configurable-void-damage-height.patch rename to patches/server/0081-Configurable-void-damage-height.patch diff --git a/patches/server/0081-Add-option-for-zombies-targetting-turtle-eggs.patch b/patches/server/0082-Add-option-for-zombies-targetting-turtle-eggs.patch similarity index 100% rename from patches/server/0081-Add-option-for-zombies-targetting-turtle-eggs.patch rename to patches/server/0082-Add-option-for-zombies-targetting-turtle-eggs.patch diff --git a/patches/server/0082-Dispenser-curse-of-binding-protection.patch b/patches/server/0083-Dispenser-curse-of-binding-protection.patch similarity index 100% rename from patches/server/0082-Dispenser-curse-of-binding-protection.patch rename to patches/server/0083-Dispenser-curse-of-binding-protection.patch diff --git a/patches/server/0083-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0084-Add-option-for-boats-to-eject-players-on-land.patch similarity index 100% rename from patches/server/0083-Add-option-for-boats-to-eject-players-on-land.patch rename to patches/server/0084-Add-option-for-boats-to-eject-players-on-land.patch diff --git a/patches/server/0084-Add-obfhelpers-for-plugin-use.patch b/patches/server/0085-Add-obfhelpers-for-plugin-use.patch similarity index 100% rename from patches/server/0084-Add-obfhelpers-for-plugin-use.patch rename to patches/server/0085-Add-obfhelpers-for-plugin-use.patch diff --git a/patches/server/0085-Mending-mends-most-damages-equipment-first.patch b/patches/server/0086-Mending-mends-most-damages-equipment-first.patch similarity index 100% rename from patches/server/0085-Mending-mends-most-damages-equipment-first.patch rename to patches/server/0086-Mending-mends-most-damages-equipment-first.patch diff --git a/patches/server/0086-Implement-bamboo-growth-settings.patch b/patches/server/0087-Implement-bamboo-growth-settings.patch similarity index 100% rename from patches/server/0086-Implement-bamboo-growth-settings.patch rename to patches/server/0087-Implement-bamboo-growth-settings.patch diff --git a/patches/server/0087-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 99% rename from patches/server/0087-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch index 11524b1b8..0da5acc9d 100644 --- a/patches/server/0087-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch @@ -126,7 +126,7 @@ index 34e08dda2..6bb73f869 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 869ba9679..10c9905c5 100644 +index 47f48d3b7..e524705bf 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1771,8 +1771,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0088-Add-5-second-tps-average-in-tps.patch b/patches/server/0089-Add-5-second-tps-average-in-tps.patch similarity index 100% rename from patches/server/0088-Add-5-second-tps-average-in-tps.patch rename to patches/server/0089-Add-5-second-tps-average-in-tps.patch diff --git a/patches/server/0089-Implement-elytra-settings.patch b/patches/server/0090-Implement-elytra-settings.patch similarity index 100% rename from patches/server/0089-Implement-elytra-settings.patch rename to patches/server/0090-Implement-elytra-settings.patch diff --git a/patches/server/0090-Add-item-entity-options.patch b/patches/server/0091-Add-item-entity-options.patch similarity index 100% rename from patches/server/0090-Add-item-entity-options.patch rename to patches/server/0091-Add-item-entity-options.patch diff --git a/patches/server/0091-Add-ping-command.patch b/patches/server/0092-Add-ping-command.patch similarity index 100% rename from patches/server/0091-Add-ping-command.patch rename to patches/server/0092-Add-ping-command.patch diff --git a/patches/server/0092-Configurable-jockey-options.patch b/patches/server/0093-Configurable-jockey-options.patch similarity index 100% rename from patches/server/0092-Configurable-jockey-options.patch rename to patches/server/0093-Configurable-jockey-options.patch diff --git a/patches/server/0093-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0094-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 100% rename from patches/server/0093-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0094-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch diff --git a/patches/server/0094-Customizable-EnderDragon-Health.patch b/patches/server/0095-Customizable-EnderDragon-Health.patch similarity index 100% rename from patches/server/0094-Customizable-EnderDragon-Health.patch rename to patches/server/0095-Customizable-EnderDragon-Health.patch diff --git a/patches/server/0095-Add-phantom-spawning-options.patch b/patches/server/0096-Add-phantom-spawning-options.patch similarity index 99% rename from patches/server/0095-Add-phantom-spawning-options.patch rename to patches/server/0096-Add-phantom-spawning-options.patch index df51d2859..70ebf4daa 100644 --- a/patches/server/0095-Add-phantom-spawning-options.patch +++ b/patches/server/0096-Add-phantom-spawning-options.patch @@ -233,7 +233,7 @@ index beaea041d..ce8834980 100644 return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata)))); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e91e5c766..489ae5459 100644 +index e9e55c6f1..db372797a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1430,6 +1430,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/patches/server/0096-Implement-bed-explosion-options.patch b/patches/server/0097-Implement-bed-explosion-options.patch similarity index 100% rename from patches/server/0096-Implement-bed-explosion-options.patch rename to patches/server/0097-Implement-bed-explosion-options.patch diff --git a/patches/server/0097-Implement-respawn-anchor-explosion-options.patch b/patches/server/0098-Implement-respawn-anchor-explosion-options.patch similarity index 100% rename from patches/server/0097-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0098-Implement-respawn-anchor-explosion-options.patch diff --git a/patches/server/0098-Add-allow-water-in-end-world-option.patch b/patches/server/0099-Add-allow-water-in-end-world-option.patch similarity index 99% rename from patches/server/0098-Add-allow-water-in-end-world-option.patch rename to patches/server/0099-Add-allow-water-in-end-world-option.patch index 01256f6b3..b4582579a 100644 --- a/patches/server/0098-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0099-Add-allow-water-in-end-world-option.patch @@ -49,7 +49,7 @@ index 120bf8436..848a185c0 100644 return true; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 489ae5459..90b4beba7 100644 +index db372797a..6cc37f5b9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1505,4 +1505,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/patches/server/0099-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch b/patches/server/0100-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch similarity index 100% rename from patches/server/0099-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch rename to patches/server/0100-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch diff --git a/patches/server/0100-ALlow-color-codes-in-books.patch b/patches/server/0101-ALlow-color-codes-in-books.patch similarity index 100% rename from patches/server/0100-ALlow-color-codes-in-books.patch rename to patches/server/0101-ALlow-color-codes-in-books.patch diff --git a/patches/server/0101-Entity-lifespan.patch b/patches/server/0102-Entity-lifespan.patch similarity index 100% rename from patches/server/0101-Entity-lifespan.patch rename to patches/server/0102-Entity-lifespan.patch diff --git a/patches/server/0102-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0103-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 100% rename from patches/server/0102-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0103-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch diff --git a/patches/server/0103-Squid-EAR-immunity.patch b/patches/server/0104-Squid-EAR-immunity.patch similarity index 100% rename from patches/server/0103-Squid-EAR-immunity.patch rename to patches/server/0104-Squid-EAR-immunity.patch diff --git a/patches/server/0104-Configurable-end-spike-seed.patch b/patches/server/0105-Configurable-end-spike-seed.patch similarity index 100% rename from patches/server/0104-Configurable-end-spike-seed.patch rename to patches/server/0105-Configurable-end-spike-seed.patch diff --git a/patches/server/0105-Configurable-dungeon-seed.patch b/patches/server/0106-Configurable-dungeon-seed.patch similarity index 100% rename from patches/server/0105-Configurable-dungeon-seed.patch rename to patches/server/0106-Configurable-dungeon-seed.patch diff --git a/patches/server/0106-Phantoms-burn-in-light.patch b/patches/server/0107-Phantoms-burn-in-light.patch similarity index 100% rename from patches/server/0106-Phantoms-burn-in-light.patch rename to patches/server/0107-Phantoms-burn-in-light.patch diff --git a/patches/server/0107-Configurable-villager-breeding.patch b/patches/server/0108-Configurable-villager-breeding.patch similarity index 100% rename from patches/server/0107-Configurable-villager-breeding.patch rename to patches/server/0108-Configurable-villager-breeding.patch diff --git a/patches/server/0108-Redstone-deactivates-spawners.patch b/patches/server/0109-Redstone-deactivates-spawners.patch similarity index 100% rename from patches/server/0108-Redstone-deactivates-spawners.patch rename to patches/server/0109-Redstone-deactivates-spawners.patch diff --git a/patches/server/0109-Totems-work-in-inventory.patch b/patches/server/0110-Totems-work-in-inventory.patch similarity index 100% rename from patches/server/0109-Totems-work-in-inventory.patch rename to patches/server/0110-Totems-work-in-inventory.patch diff --git a/patches/server/0110-Fix-death-message-colors.patch b/patches/server/0111-Fix-death-message-colors.patch similarity index 98% rename from patches/server/0110-Fix-death-message-colors.patch rename to patches/server/0111-Fix-death-message-colors.patch index c8064ea06..609dc60af 100644 --- a/patches/server/0110-Fix-death-message-colors.patch +++ b/patches/server/0111-Fix-death-message-colors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix death message colors diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 10c9905c5..a63616b32 100644 +index e524705bf..60f68e480 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -667,7 +667,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0111-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch b/patches/server/0112-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch similarity index 100% rename from patches/server/0111-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch rename to patches/server/0112-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch diff --git a/patches/server/0112-Populator-seed-controls.patch b/patches/server/0113-Populator-seed-controls.patch similarity index 100% rename from patches/server/0112-Populator-seed-controls.patch rename to patches/server/0113-Populator-seed-controls.patch diff --git a/patches/server/0113-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0114-Add-vindicator-johnny-spawn-chance.patch similarity index 100% rename from patches/server/0113-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0114-Add-vindicator-johnny-spawn-chance.patch diff --git a/patches/server/0114-DragonEggPlaceEvent.patch b/patches/server/0115-DragonEggPlaceEvent.patch similarity index 100% rename from patches/server/0114-DragonEggPlaceEvent.patch rename to patches/server/0115-DragonEggPlaceEvent.patch diff --git a/patches/server/0115-Add-option-to-disable-mushroom-block-updates.patch b/patches/server/0116-Add-option-to-disable-mushroom-block-updates.patch similarity index 100% rename from patches/server/0115-Add-option-to-disable-mushroom-block-updates.patch rename to patches/server/0116-Add-option-to-disable-mushroom-block-updates.patch diff --git a/patches/server/0116-PaperMC-Buffer-joins.patch b/patches/server/0117-PaperMC-Buffer-joins.patch similarity index 100% rename from patches/server/0116-PaperMC-Buffer-joins.patch rename to patches/server/0117-PaperMC-Buffer-joins.patch diff --git a/patches/server/0117-Dispensers-place-anvils-option.patch b/patches/server/0118-Dispensers-place-anvils-option.patch similarity index 100% rename from patches/server/0117-Dispensers-place-anvils-option.patch rename to patches/server/0118-Dispensers-place-anvils-option.patch diff --git a/patches/server/0118-Allow-anvil-colors.patch b/patches/server/0119-Allow-anvil-colors.patch similarity index 100% rename from patches/server/0118-Allow-anvil-colors.patch rename to patches/server/0119-Allow-anvil-colors.patch diff --git a/patches/server/0119-Add-no-tick-block-list.patch b/patches/server/0120-Add-no-tick-block-list.patch similarity index 99% rename from patches/server/0119-Add-no-tick-block-list.patch rename to patches/server/0120-Add-no-tick-block-list.patch index a0174eeec..2896a8d73 100644 --- a/patches/server/0119-Add-no-tick-block-list.patch +++ b/patches/server/0120-Add-no-tick-block-list.patch @@ -22,7 +22,7 @@ index 82e07b357..05a7422fb 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 17105c9a1..6c783f07a 100644 +index 004cc8616..5e4ccb066 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -305,14 +305,14 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0120-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0121-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 100% rename from patches/server/0120-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0121-Add-option-to-disable-dolphin-treasure-searching.patch diff --git a/patches/server/0121-Add-option-to-reset-reputation-when-villager-is-cure.patch b/patches/server/0122-Add-option-to-reset-reputation-when-villager-is-cure.patch similarity index 100% rename from patches/server/0121-Add-option-to-reset-reputation-when-villager-is-cure.patch rename to patches/server/0122-Add-option-to-reset-reputation-when-villager-is-cure.patch diff --git a/patches/server/0122-PaperPR-Optimize-redstone-algorithm.patch b/patches/server/0123-PaperPR-Optimize-redstone-algorithm.patch similarity index 99% rename from patches/server/0122-PaperPR-Optimize-redstone-algorithm.patch rename to patches/server/0123-PaperPR-Optimize-redstone-algorithm.patch index 263ebf6ec..6c419d147 100644 --- a/patches/server/0122-PaperPR-Optimize-redstone-algorithm.patch +++ b/patches/server/0123-PaperPR-Optimize-redstone-algorithm.patch @@ -1137,7 +1137,7 @@ index 7b3ccded0..6abc3d4cf 100644 c(iblockdata, world, blockposition); world.a(blockposition, false); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 90b4beba7..6fb930b99 100644 +index 6cc37f5b9..a4bb58136 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -614,6 +614,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/patches/server/0123-Short-enderman-height.patch b/patches/server/0124-Short-enderman-height.patch similarity index 100% rename from patches/server/0123-Short-enderman-height.patch rename to patches/server/0124-Short-enderman-height.patch diff --git a/patches/server/0124-Stop-squids-floating-on-top-of-water.patch b/patches/server/0125-Stop-squids-floating-on-top-of-water.patch similarity index 100% rename from patches/server/0124-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0125-Stop-squids-floating-on-top-of-water.patch diff --git a/patches/server/0125-Ridables.patch b/patches/server/0126-Ridables.patch similarity index 99% rename from patches/server/0125-Ridables.patch rename to patches/server/0126-Ridables.patch index 2b3dd771c..4a05de3ba 100644 --- a/patches/server/0125-Ridables.patch +++ b/patches/server/0126-Ridables.patch @@ -588,7 +588,7 @@ index f55f12530..22b9c84b0 100644 if (this.c <= 0) { this.c = 100; diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index 314886398..ad988447a 100644 +index 79de11ce2..eba8e77ca 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -41,6 +41,25 @@ public class EntityCat extends EntityTameableAnimal {