Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #836

Browse Source
This commit is contained in:
BillyGalbreath
2022-01-06 20:40:32 -06:00
parent 695f09c664
commit 176a9cc15d
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/server/0124-Configurable-default-collar-color.patch
View File

@@ -6,8 +6,6 @@ Subject: [PATCH] Configurable default collar color
This allows for the server to set a default collar color when a wolf or cat is tamed. This allows for the server to set a default collar color when a wolf or cat is tamed.
Resets to RED when the value is invalid. Resets to RED when the value is invalid.
test
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
index e9a165b7bb66dd4ae1c1befc67c671f45ec8271b..7d1e22f3c6eb5462d07027b3a2890b07667ddc46 100644 index e9a165b7bb66dd4ae1c1befc67c671f45ec8271b..7d1e22f3c6eb5462d07027b3a2890b07667ddc46 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java

4
patches/server/0253-Shears-can-have-looting-enchantment.patch
View File

@@ -139,7 +139,7 @@ index d6417c1e77ac8823e18a179dc9f61757a1f339ad..90f3db3401d5b5ea5b9456f21d7f9bff
}; };
diff --git a/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java b/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java diff --git a/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java b/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java
index 6b8a1535086aae7e4e3229d05615fb903188f507..2c3d984cef5e589b72c5509c1eea1422865aa69c 100644 index 6b8a1535086aae7e4e3229d05615fb903188f507..20adfaab6af8cce48fbd489876bf18b43d1ae21c 100644
--- a/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java --- a/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java
+++ b/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java +++ b/src/main/java/net/minecraft/world/item/enchantment/LootBonusEnchantment.java
@@ -7,6 +7,14 @@ public class LootBonusEnchantment extends Enchantment { @@ -7,6 +7,14 @@ public class LootBonusEnchantment extends Enchantment {
@@ -150,7 +150,7 @@ index 6b8a1535086aae7e4e3229d05615fb903188f507..2c3d984cef5e589b72c5509c1eea1422
+ @Override + @Override
+ public boolean canEnchant(net.minecraft.world.item.ItemStack stack) { + public boolean canEnchant(net.minecraft.world.item.ItemStack stack) {
+ // we have to cheat the system because this class is loaded before purpur's config is loaded + // we have to cheat the system because this class is loaded before purpur's config is loaded
+ return (org.purpurmc.purpur.PurpurConfig.allowShearsLooting ? EnchantmentCategory.SHEARS : this.category).canEnchant(stack.getItem()); + return (org.purpurmc.purpur.PurpurConfig.allowShearsLooting && this.category == EnchantmentCategory.WEAPON ? EnchantmentCategory.SHEARS : this.category).canEnchant(stack.getItem());
+ } + }
+ // Purpur end + // Purpur end
+ +