diff --git a/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch index 7180b1939..e4adb235a 100644 --- a/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch +++ b/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch @@ -5,34 +5,15 @@ Subject: [PATCH] Snowman drop and put back pumpkin diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index 48997367a67ffd1dbf29cdb048720610528f35cb..95ee716fc9b79b5fcb8508118b3876c51f3f6987 100644 +index 48997367a67ffd1dbf29cdb048720610528f35cb..51396cbd18d0e053e788f82bf4a3bc2533f20e11 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java -@@ -7,6 +7,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory; - - public class EntitySnowman extends EntityGolem implements IShearable, IRangedEntity { - -+ private static final RecipeItemStack PUMPKIN = RecipeItemStack.a(Blocks.PUMPKIN.getItem(), Blocks.CARVED_PUMPKIN.getItem(), Blocks.JACK_O_LANTERN.getItem()); // Purpur - private static final DataWatcherObject b = DataWatcher.a(EntitySnowman.class, DataWatcherRegistry.a); - - public EntitySnowman(EntityTypes entitytypes, World world) { -@@ -120,9 +121,25 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt - itemstack.damage(1, entityhuman, (entityhuman1) -> { - entityhuman1.broadcastItemBreak(enumhand); - }); -+ // Purpur start -+ if (world.purpurConfig.snowGolemDropsPumpkin) { -+ EntityItem pumpkin = new EntityItem(world, locX(), locY(), locZ(), new ItemStack(Blocks.CARVED_PUMPKIN.getItem())); -+ pumpkin.pickupDelay = 10; -+ world.addEntity(pumpkin); -+ return EnumInteractionResult.SUCCESS; -+ } -+ // Purpur end +@@ -123,6 +123,14 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt } return EnumInteractionResult.a(this.world.isClientSide); + // Purpur start -+ } else if (world.purpurConfig.snowGolemPutPumpkinBack && !hasPumpkin() && PUMPKIN.test(itemstack)) { ++ } else if (world.purpurConfig.snowGolemPutPumpkinBack && !hasPumpkin() && itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) { + setHasPumpkin(true); + if (!entityhuman.abilities.canInstantlyBuild) { + itemstack.subtract(1); @@ -42,15 +23,23 @@ index 48997367a67ffd1dbf29cdb048720610528f35cb..95ee716fc9b79b5fcb8508118b3876c5 } else { return EnumInteractionResult.PASS; } +@@ -133,6 +141,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt + this.world.playSound((EntityHuman) null, (Entity) this, SoundEffects.ENTITY_SNOW_GOLEM_SHEAR, soundcategory, 1.0F, 1.0F); + if (!this.world.s_()) { + this.setHasPumpkin(false); ++ if (world.purpurConfig.snowGolemDropsPumpkin) // Purpur + this.a(new ItemStack(Items.dj), 1.7F); + } + diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 24ef91788ff69004eed1b136a0ceb6176db00e76..6d93ff4b08582f0f3ea1bb4b582aaa881651d34d 100644 +index 24ef91788ff69004eed1b136a0ceb6176db00e76..609307a409365829e61430da47aa75125afcb8c4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -208,6 +208,13 @@ public class PurpurWorldConfig { rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller); } -+ public boolean snowGolemDropsPumpkin = false; ++ public boolean snowGolemDropsPumpkin = true; + public boolean snowGolemPutPumpkinBack = false; + private void snowGolemSettings() { + snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin); diff --git a/patches/server/0044-Ender-dragon-always-drop-full-exp.patch b/patches/server/0044-Ender-dragon-always-drop-full-exp.patch index c26fb1ac8..598dea52b 100644 --- a/patches/server/0044-Ender-dragon-always-drop-full-exp.patch +++ b/patches/server/0044-Ender-dragon-always-drop-full-exp.patch @@ -18,7 +18,7 @@ index de53af8c01f8fa9636386737b6bc071b32f87cd1..a5a2182455542bb8fd62941bd0da2f38 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6d93ff4b08582f0f3ea1bb4b582aaa881651d34d..55cc0c4bafe35b9d8bb15bd017d5ea429a427e60 100644 +index 609307a409365829e61430da47aa75125afcb8c4..66c0725c3dc28e49387d2b9f1a15aa0758763c08 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -142,6 +142,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0045-Signs-editable-on-right-click.patch b/patches/server/0045-Signs-editable-on-right-click.patch index 5fb911c10..d753ccd46 100644 --- a/patches/server/0045-Signs-editable-on-right-click.patch +++ b/patches/server/0045-Signs-editable-on-right-click.patch @@ -39,7 +39,7 @@ index 2b9d5724c1b63f5e55010f9e3450004821c098a4..316766970243e8ac00e4c82f6c710de5 // Paper start //this.c = entityhuman; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 55cc0c4bafe35b9d8bb15bd017d5ea429a427e60..e5a160ef0a193445cf42f1569109a502d2fe52d4 100644 +index 66c0725c3dc28e49387d2b9f1a15aa0758763c08..8393a0253ac16a8f15f78288d6cc31f8688c403c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -109,6 +109,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0046-Signs-allow-color-codes.patch b/patches/server/0046-Signs-allow-color-codes.patch index 40a728fd7..5d53bec4e 100644 --- a/patches/server/0046-Signs-allow-color-codes.patch +++ b/patches/server/0046-Signs-allow-color-codes.patch @@ -59,7 +59,7 @@ index 316766970243e8ac00e4c82f6c710de5edc3fa51..852bb5db84ddd735f5e0d7f922918cc9 @Override public PacketPlayOutTileEntityData getUpdatePacket() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e5a160ef0a193445cf42f1569109a502d2fe52d4..e73b493c67b53273330dbf7abbda2ace54a169f4 100644 +index 8393a0253ac16a8f15f78288d6cc31f8688c403c..484da2bf267cab4e4569c98111398af64c834eed 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -109,8 +109,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch index 53f0ed181..68ddef66a 100644 --- a/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch +++ b/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch @@ -36,7 +36,7 @@ index a315e2628c35ee713b68741c6e52c4b140c05f27..8dd48669c29dd51ed4d535dad0b0319f @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e73b493c67b53273330dbf7abbda2ace54a169f4..3cc9fcfe0945e7c56c9e74ef273baf3dfc4b53f6 100644 +index 484da2bf267cab4e4569c98111398af64c834eed..56793a9e8f963b63a22aac5337299fbfb07389f0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -109,6 +109,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0048-Controllable-Minecarts.patch b/patches/server/0048-Controllable-Minecarts.patch index b92ded7d0..c16977988 100644 --- a/patches/server/0048-Controllable-Minecarts.patch +++ b/patches/server/0048-Controllable-Minecarts.patch @@ -143,7 +143,7 @@ index ceef7aaf923026ff1044d6feba4297279eb44157..002651aaf3b8a9b489fe323756cd1ad1 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3cc9fcfe0945e7c56c9e74ef273baf3dfc4b53f6..248a5c0c5142cde9dec0d7c1de665b0c37fa3e8c 100644 +index 56793a9e8f963b63a22aac5337299fbfb07389f0..c6682064ff5d653d14f658396a6a5461d4554fab 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1,5 +1,7 @@ diff --git a/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch index dfb23aacb..0468861c9 100644 --- a/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch @@ -20,7 +20,7 @@ index 4e2149b422a643bd30c8d8d13adc9e5f5f2a8cca..762f65d7e12c020f4acdc8a0a9a10299 // CraftBukkit start - Call death event org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 248a5c0c5142cde9dec0d7c1de665b0c37fa3e8c..6b3c1a07497f8c5f06ac7ed7df31fc8224f94007 100644 +index c6682064ff5d653d14f658396a6a5461d4554fab..8d1ad37f17935331ee867c15f91842cdc53d4450 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -112,6 +112,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch index a1bbef8f6..8b3e52e7a 100644 --- a/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch +++ b/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch @@ -19,7 +19,7 @@ index fcf254bbaeb3c0ffdb6834a8d5ad2c3cf4235e5b..79554e18fc39ecd9db87618a59d2e670 return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6b3c1a07497f8c5f06ac7ed7df31fc8224f94007..b2ad6265a9e2bb16592fb9719339be83d92ff82b 100644 +index 8d1ad37f17935331ee867c15f91842cdc53d4450..bec457e5aac17b0db0788110ceda778c81f26042 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -113,8 +113,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch index 0c63ca569..f756a37ab 100644 --- a/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch +++ b/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch @@ -17,7 +17,7 @@ index 1ae9910fefece1a3fe6410b27642da6edd8f296d..c872be77a6cd767520d5412b38ec4ed4 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b2ad6265a9e2bb16592fb9719339be83d92ff82b..92590d92c6eb5e0d56d7c1791782c2a7d03edb66 100644 +index bec457e5aac17b0db0788110ceda778c81f26042..d6a95f47c42538b574ec55c0cfffe064b80fdef0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -279,6 +279,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch index 4a686f911..38652276a 100644 --- a/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch +++ b/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch @@ -18,7 +18,7 @@ index 8026a55d462a646d6b39db21d52ba0871dfbc4d3..2acbe7437df71fc27580deddee8eb765 if (b0 > 0 && !this.z()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 92590d92c6eb5e0d56d7c1791782c2a7d03edb66..326be3a0ea64c328a6e8aafc752111f71e149381 100644 +index d6a95f47c42538b574ec55c0cfffe064b80fdef0..4a0bbc0cd41b4a50ebad9b4569e07d727fc3e482 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -114,9 +114,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch index 7b3733946..edf87f877 100644 --- a/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch +++ b/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch @@ -47,7 +47,7 @@ index f53525eb32a6096ae24fd23756b2169d5d39e9d4..7b175240e44b0c7eb5044d7bcaf54dac } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 326be3a0ea64c328a6e8aafc752111f71e149381..f56710d84ab8519519edbcf1040aea912f9f4f3c 100644 +index 4a0bbc0cd41b4a50ebad9b4569e07d727fc3e482..236b4f51ea805c671b905c1b081538b67cee7f57 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -191,8 +191,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch index a85f2ec43..fdef69277 100644 --- a/patches/server/0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch +++ b/patches/server/0060-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch @@ -18,7 +18,7 @@ index 3936741bb8c1b3ad766d651e4bb8c9f5ddbe4f08..ac6460d261014bb4b9878c96e4b447f7 Iterator iterator = list.iterator(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f56710d84ab8519519edbcf1040aea912f9f4f3c..9878953c76a9bcd2a29774a37c1b65ec919b3963 100644 +index 236b4f51ea805c671b905c1b081538b67cee7f57..2fae60a6fd767cc6d0aed7a6241ba5a6bf05eaca 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -113,10 +113,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch index 423d5dbf3..846453c87 100644 --- a/patches/server/0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch +++ b/patches/server/0061-Villagers-farming-can-bypass-mob-griefing-gamerule.patch @@ -18,7 +18,7 @@ index 54a555509e3d83e9749609dc35897ad151bca681..0ff202c0d77681f7e0d55d57c69dd0e4 } else if (entityvillager.getVillagerData().getProfession() != VillagerProfession.FARMER) { return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9878953c76a9bcd2a29774a37c1b65ec919b3963..744e1406e7a47045eff7a20b03a8eaf7128d768e 100644 +index 2fae60a6fd767cc6d0aed7a6241ba5a6bf05eaca..edcbec38dfb5b32f4b8ba40c7a1ac6e26f0a4c3b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -285,9 +285,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0062-Villagers-follow-emerald-blocks.patch b/patches/server/0062-Villagers-follow-emerald-blocks.patch index 994e1c00d..183c28977 100644 --- a/patches/server/0062-Villagers-follow-emerald-blocks.patch +++ b/patches/server/0062-Villagers-follow-emerald-blocks.patch @@ -48,7 +48,7 @@ index f1a509063c09e603140c74255a3fb901693d2cc5..74c2d89af516ffc252032d5cbd12b489 this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D)); this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 744e1406e7a47045eff7a20b03a8eaf7128d768e..a7e9793d21b86c52fdfe5ef84a8edc8faaf55d48 100644 +index edcbec38dfb5b32f4b8ba40c7a1ac6e26f0a4c3b..a1f85ef007f2ed410f1662405b0b1175c544e0b6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -286,10 +286,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0063-Allow-leashing-villagers.patch b/patches/server/0063-Allow-leashing-villagers.patch index 016e88374..f1cdb430e 100644 --- a/patches/server/0063-Allow-leashing-villagers.patch +++ b/patches/server/0063-Allow-leashing-villagers.patch @@ -51,7 +51,7 @@ index 74c2d89af516ffc252032d5cbd12b489ea46813e..96dda6a14fd17509e9bcb72cc7e9c853 @Override public EntityAgeable createChild(WorldServer worldserver, EntityAgeable entityageable) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a7e9793d21b86c52fdfe5ef84a8edc8faaf55d48..6954d4ac923cda1e0a0ead13c33dbc67ef6203b7 100644 +index a1f85ef007f2ed410f1662405b0b1175c544e0b6..a9e7ddd55aa2b9b2c8f172069353b070c427b806 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -285,17 +285,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch index 1b54d36e4..eb97c8ef8 100644 --- a/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0064-Implement-configurable-search-radius-for-villagers-t.patch @@ -18,7 +18,7 @@ index e4aedb3df5d0a47b5bb9175627aa794fc1779639..c06425434c97645b914c07940528901a for (int i = 0; i < 10; ++i) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6954d4ac923cda1e0a0ead13c33dbc67ef6203b7..93054e3bd9a9140dd86f2cfeb9d151251e816868 100644 +index a9e7ddd55aa2b9b2c8f172069353b070c427b806..0de099d29b5e351822e59af6e389dc91c67eb2b2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -288,12 +288,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0065-Implement-infinite-lava.patch b/patches/server/0065-Implement-infinite-lava.patch index 15152d232..24cafcab5 100644 --- a/patches/server/0065-Implement-infinite-lava.patch +++ b/patches/server/0065-Implement-infinite-lava.patch @@ -59,7 +59,7 @@ index 29930e801cdcb97bec2fb113ec478fe9c4a63b63..ffab2391925f577420ee52f3aa05041a protected boolean f() { return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 93054e3bd9a9140dd86f2cfeb9d151251e816868..fc480a8df65768e980bd5ae5f2085d792e5f735b 100644 +index 0de099d29b5e351822e59af6e389dc91c67eb2b2..37bc3033b3b7281da4f8783d3fbe9a0a4d33a9de 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -158,6 +158,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0066-Make-lava-flow-speed-configurable.patch b/patches/server/0066-Make-lava-flow-speed-configurable.patch index e71973009..56ea9ec1a 100644 --- a/patches/server/0066-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0066-Make-lava-flow-speed-configurable.patch @@ -18,7 +18,7 @@ index ffab2391925f577420ee52f3aa05041afa61464e..d981aa5a5f001333675eabd50497bbfa @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index fc480a8df65768e980bd5ae5f2085d792e5f735b..0511516646c24eaa5dc2edbb24ef1b92a51dd906 100644 +index 37bc3033b3b7281da4f8783d3fbe9a0a4d33a9de..d5adf653c6a561fe1de9e340d85c9439f8c559f5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -160,9 +160,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0067-Add-player-death-exp-control-options.patch b/patches/server/0067-Add-player-death-exp-control-options.patch index 536d34abf..9abb63ebe 100644 --- a/patches/server/0067-Add-player-death-exp-control-options.patch +++ b/patches/server/0067-Add-player-death-exp-control-options.patch @@ -40,7 +40,7 @@ index e0cf2af8fcbfc66fc32aa8e693b62160b24f8672..093df82d49bfa6c34f081a719b5212ec return 0; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0511516646c24eaa5dc2edbb24ef1b92a51dd906..4d6618db81b0306d37b1de01564bd6e7eabd4291 100644 +index d5adf653c6a561fe1de9e340d85c9439f8c559f5..c5574ac52d050cc1b89ab2dbd4dad5ce5e331f83 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -123,6 +123,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0069-Configurable-void-damage-height.patch b/patches/server/0069-Configurable-void-damage-height.patch index 169332943..809b31c00 100644 --- a/patches/server/0069-Configurable-void-damage-height.patch +++ b/patches/server/0069-Configurable-void-damage-height.patch @@ -18,7 +18,7 @@ index dfbb5a9538780cbd2a5766486138f35b189da235..9eb2e73c084b142bf04f798b572e6ca8 && this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) { this.doVoidDamage(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4d6618db81b0306d37b1de01564bd6e7eabd4291..e150753b7635476ca3c0c0d0806db8121f6e6cd3 100644 +index c5574ac52d050cc1b89ab2dbd4dad5ce5e331f83..4d34957c6255af571e593e015fa9dcafa733aceb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -116,11 +116,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0070-Dispenser-curse-of-binding-protection.patch b/patches/server/0070-Dispenser-curse-of-binding-protection.patch index 60d4bbcd3..a6e2a960d 100644 --- a/patches/server/0070-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0070-Dispenser-curse-of-binding-protection.patch @@ -44,7 +44,7 @@ index 669a5041184846ca8430a7f0d3197025fe6d437e..7cd2e871b5a429a86dbc3c4208d247a4 return this.b; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e150753b7635476ca3c0c0d0806db8121f6e6cd3..e10a34e1d81e814921b853b8b4252b13e0d05aab 100644 +index 4d34957c6255af571e593e015fa9dcafa733aceb..26df95f502d117398c7c9c65b298b97b62021700 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -162,6 +162,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0071-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0071-Add-option-for-boats-to-eject-players-on-land.patch index 46d11839b..8811b751b 100644 --- a/patches/server/0071-Add-option-for-boats-to-eject-players-on-land.patch +++ b/patches/server/0071-Add-option-for-boats-to-eject-players-on-land.patch @@ -17,7 +17,7 @@ index baa4a61114e7460c74027e1519332f0dd9582647..603910a6f9ecc34be9eb2d4fb28e5c2e } else { return EntityBoat.EnumStatus.IN_AIR; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e10a34e1d81e814921b853b8b4252b13e0d05aab..ed277e64f7228e1cd4a9697fd775715f761a3e13 100644 +index 26df95f502d117398c7c9c65b298b97b62021700..5eae6c99e35d53f5340bc81034823a2f1ed85544 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -112,12 +112,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0073-Mending-mends-most-damages-equipment-first.patch b/patches/server/0073-Mending-mends-most-damages-equipment-first.patch index a702f95eb..c3df7e26e 100644 --- a/patches/server/0073-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0073-Mending-mends-most-damages-equipment-first.patch @@ -78,7 +78,7 @@ index 7f3df9ba37076c0a982803148d21b0985f62f12c..e747ee83f1a69a4a4bad87e720abc9b0 return this.tag == null ? 0 : this.tag.getInt("Damage"); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ed277e64f7228e1cd4a9697fd775715f761a3e13..f5980d21cc10b3a43ae3ed2be961449810790e75 100644 +index 5eae6c99e35d53f5340bc81034823a2f1ed85544..66e74ee74b56e25ca46704ca6cec403f15126c33 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -112,6 +112,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0075-Implement-elytra-settings.patch b/patches/server/0075-Implement-elytra-settings.patch index c4fac0a1d..b493a979c 100644 --- a/patches/server/0075-Implement-elytra-settings.patch +++ b/patches/server/0075-Implement-elytra-settings.patch @@ -93,7 +93,7 @@ index 4eeeecef51cedcd0fe46ac4983472e214ccc9dad..0109d8db4f154802daef570e6d8b479c entityhuman.r(20); if (entityhuman.isOnGround()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f5980d21cc10b3a43ae3ed2be961449810790e75..c5193b394319fa68bedc6aa07b57fea24ac49d80 100644 +index 66e74ee74b56e25ca46704ca6cec403f15126c33..ef977c50ab987f0762e1f9efd8ac6f559c38aaef 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -129,6 +129,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0076-Item-entity-immunities.patch b/patches/server/0076-Item-entity-immunities.patch index e4a4a42a4..99fa23233 100644 --- a/patches/server/0076-Item-entity-immunities.patch +++ b/patches/server/0076-Item-entity-immunities.patch @@ -94,7 +94,7 @@ index 81a82a1fa811956a8b5233677981c2d3783b34fb..a9d60e5dc2f3b38a192a68d79bcf78e4 int i; int j; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c5193b394319fa68bedc6aa07b57fea24ac49d80..9940bf351c05606137837ab2400ffe1a02b9bec2 100644 +index ef977c50ab987f0762e1f9efd8ac6f559c38aaef..1e38e2e87ad30a908d9cf8d1455bb9250e281e55 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -101,6 +101,39 @@ public class PurpurWorldConfig { diff --git a/patches/server/0078-Configurable-jockey-options.patch b/patches/server/0078-Configurable-jockey-options.patch index d64ce51a2..68a153234 100644 --- a/patches/server/0078-Configurable-jockey-options.patch +++ b/patches/server/0078-Configurable-jockey-options.patch @@ -193,7 +193,7 @@ index e021c43b43839c00f81a01bfbec59c546d61ba50..505c83f3e3ad61c2d4d40c4df017e1f7 protected void initDatawatcher() { super.initDatawatcher(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9940bf351c05606137837ab2400ffe1a02b9bec2..81a96503a6243800f4c37dc32f9550e3ee817fbb 100644 +index 1e38e2e87ad30a908d9cf8d1455bb9250e281e55..dd6a86d5765008f98e59b54a365d824e390fdf94 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -275,6 +275,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 48fc74206..926ee69ac 100644 --- a/patches/server/0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0079-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -321,7 +321,7 @@ index 3a70900c73e3a6c4f40cf74406534f4bfd3eb67b..dfce36368da9bdd9285c490a802f7a0c return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 81a96503a6243800f4c37dc32f9550e3ee817fbb..39f6b309342b91ab3bd4eed4afbeb8ccb1387e64 100644 +index dd6a86d5765008f98e59b54a365d824e390fdf94..88cac6394f67ec113a781a552261f760fc95eb16 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -349,6 +349,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0080-Add-phantom-spawning-options.patch b/patches/server/0080-Add-phantom-spawning-options.patch index 8a1a033e8..58cf5ed21 100644 --- a/patches/server/0080-Add-phantom-spawning-options.patch +++ b/patches/server/0080-Add-phantom-spawning-options.patch @@ -245,7 +245,7 @@ index 226b5cd399449ca3587964221765e4d241dfc739..0f259913ddcf151bc0128f2591e1223a public int c() { return this.d; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 39f6b309342b91ab3bd4eed4afbeb8ccb1387e64..966784d5398929497f4a426280bba47bb7caf9a7 100644 +index 88cac6394f67ec113a781a552261f760fc95eb16..fedc39bdbbd328296c5c08d220d6695fe08fdf91 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -352,10 +352,34 @@ public class PurpurWorldConfig { diff --git a/patches/server/0081-Implement-bed-explosion-options.patch b/patches/server/0081-Implement-bed-explosion-options.patch index eae970c21..f03b86fa8 100644 --- a/patches/server/0081-Implement-bed-explosion-options.patch +++ b/patches/server/0081-Implement-bed-explosion-options.patch @@ -18,7 +18,7 @@ index 24a5c64b65f0098b1395d352cc2f99bbbbaf9c94..738535d01adf8bfd895b5057e5950422 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 966784d5398929497f4a426280bba47bb7caf9a7..ea20ca8dc50ff1216ce8ca351ef991d5808bd88c 100644 +index fedc39bdbbd328296c5c08d220d6695fe08fdf91..35e4f4160358b12b61d2763b8d2f5ff51022b666 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -2,6 +2,7 @@ package net.pl3x.purpur; diff --git a/patches/server/0082-Implement-respawn-anchor-explosion-options.patch b/patches/server/0082-Implement-respawn-anchor-explosion-options.patch index 690ffcc51..506b6b6cb 100644 --- a/patches/server/0082-Implement-respawn-anchor-explosion-options.patch +++ b/patches/server/0082-Implement-respawn-anchor-explosion-options.patch @@ -30,7 +30,7 @@ index 21c5ad83a95bcd23071423c0e8336656b760fcde..521d161a3d015b641b61de21401c79ac public static boolean a(World world) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ea20ca8dc50ff1216ce8ca351ef991d5808bd88c..8aaa718a0df3f71f9a06bf8eb3547453b26551da 100644 +index 35e4f4160358b12b61d2763b8d2f5ff51022b666..07e60861c99db1ee1ba7a01c7a666a83e644aa2a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -251,6 +251,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0085-Entity-lifespan.patch b/patches/server/0085-Entity-lifespan.patch index 0d7792c78..fc5f6c820 100644 --- a/patches/server/0085-Entity-lifespan.patch +++ b/patches/server/0085-Entity-lifespan.patch @@ -104,7 +104,7 @@ index ffccdc3bf1d28836f4fc2772ebfde843415ea232..8932f4854d9fc52fb2ec66a748e640df 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 8aaa718a0df3f71f9a06bf8eb3547453b26551da..5a04f0e506293f76bc43540142ca3b26cf97c760 100644 +index 07e60861c99db1ee1ba7a01c7a666a83e644aa2a..2e3fee6bc4f3af7ad07a0db5657ffb3238e77e96 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -103,6 +103,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index fa2a8ab1f..df94a284c 100644 --- a/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0086-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -48,7 +48,7 @@ index 41f9b0b905fd79a9c570be601048f817aba64bbd..fa8e8cdb2ee594fea47c32acf6013771 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5a04f0e506293f76bc43540142ca3b26cf97c760..0b2a9a2d9f157dd9879c4429be6745859b4f28bf 100644 +index 2e3fee6bc4f3af7ad07a0db5657ffb3238e77e96..5d35651f43de81c8cf047479ad9c88c4b3f1c38c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -196,6 +196,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0087-Squid-EAR-immunity.patch b/patches/server/0087-Squid-EAR-immunity.patch index 3db827a05..72311de18 100644 --- a/patches/server/0087-Squid-EAR-immunity.patch +++ b/patches/server/0087-Squid-EAR-immunity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Squid EAR immunity diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0b2a9a2d9f157dd9879c4429be6745859b4f28bf..01576ac82836733f42168c6a0779b45ae63aeebb 100644 +index 5d35651f43de81c8cf047479ad9c88c4b3f1c38c..32bb2524641722d16b6bafcc6b1af2793c1d9a45 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -453,6 +453,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0090-Phantoms-burn-in-light.patch b/patches/server/0090-Phantoms-burn-in-light.patch index 2ae5616f3..79673c8a5 100644 --- a/patches/server/0090-Phantoms-burn-in-light.patch +++ b/patches/server/0090-Phantoms-burn-in-light.patch @@ -70,7 +70,7 @@ index 4c379916d8d7797038d2980761c49f44c010dea8..ea6b61c9b88f33d29f7266d7614c8037 public static final Item dr = a(Blocks.JACK_O_LANTERN, CreativeModeTab.b); public static final Item ds = a(Blocks.OAK_TRAPDOOR, CreativeModeTab.d); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 01576ac82836733f42168c6a0779b45ae63aeebb..a4e5462d4731aaa4b0c436cf001d9c2be1cc961c 100644 +index 32bb2524641722d16b6bafcc6b1af2793c1d9a45..fd7eabb033d8900bfab28c3d4a06626f7c0c3ef3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -408,6 +408,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0091-Configurable-villager-breeding.patch b/patches/server/0091-Configurable-villager-breeding.patch index 26402e4ec..2a12e0bd4 100644 --- a/patches/server/0091-Configurable-villager-breeding.patch +++ b/patches/server/0091-Configurable-villager-breeding.patch @@ -18,7 +18,7 @@ index c06425434c97645b914c07940528901a2979ce1b..a0bfef54c853d57c9a5c6d3f9f195916 private boolean fr() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a4e5462d4731aaa4b0c436cf001d9c2be1cc961c..76ed53f930f6d2e01a854d0e28db4bcf11a06627 100644 +index fd7eabb033d8900bfab28c3d4a06626f7c0c3ef3..a47962e2cc277a5c86b9cb5ab793e84286bd9af1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -471,6 +471,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0092-Redstone-deactivates-spawners.patch b/patches/server/0092-Redstone-deactivates-spawners.patch index 437c4bd4a..ecf5db435 100644 --- a/patches/server/0092-Redstone-deactivates-spawners.patch +++ b/patches/server/0092-Redstone-deactivates-spawners.patch @@ -26,7 +26,7 @@ index c2e830db7aa2944a477624e149a3ba66d112b68a..3b4cc9871c123cfd134783745145c407 public abstract BlockPosition b(); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 76ed53f930f6d2e01a854d0e28db4bcf11a06627..1f83fae3935d8bdacd396697e36d3c80d4d93b42 100644 +index a47962e2cc277a5c86b9cb5ab793e84286bd9af1..743d1fe2eab2157a1100d0ef13d65ce85b10dbaa 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -284,6 +284,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0093-Totems-work-in-inventory.patch b/patches/server/0093-Totems-work-in-inventory.patch index 08985e30d..84abbbcbe 100644 --- a/patches/server/0093-Totems-work-in-inventory.patch +++ b/patches/server/0093-Totems-work-in-inventory.patch @@ -29,7 +29,7 @@ index 67f33647cd66c32fcc6d91edd7f66684c0e6464f..a7a5917fc7c6bbdecab26884cac361bc event.setCancelled(itemstack == null); this.world.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1f83fae3935d8bdacd396697e36d3c80d4d93b42..9c32d1d0d283ce8fb290623c8e40c2606d2fdd82 100644 +index 743d1fe2eab2157a1100d0ef13d65ce85b10dbaa..40a248746ea53640697395a155c18215fd2bbe51 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -201,6 +201,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0097-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0097-Add-vindicator-johnny-spawn-chance.patch index e34ad6f6a..5d463fc91 100644 --- a/patches/server/0097-Add-vindicator-johnny-spawn-chance.patch +++ b/patches/server/0097-Add-vindicator-johnny-spawn-chance.patch @@ -22,7 +22,7 @@ index 4761ddfedeed54e79788a6f60f06a805efd60ab1..23b350f793539672b6990327ed52e9bb } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9c32d1d0d283ce8fb290623c8e40c2606d2fdd82..a38cea444879becaa043f131b754f7d812375e6c 100644 +index 40a248746ea53640697395a155c18215fd2bbe51..87c68707aaab2d0e49d4e9c17de94b28a4324799 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -40,6 +40,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0099-Dispensers-place-anvils-option.patch b/patches/server/0099-Dispensers-place-anvils-option.patch index 7d9d52d39..89c477204 100644 --- a/patches/server/0099-Dispensers-place-anvils-option.patch +++ b/patches/server/0099-Dispensers-place-anvils-option.patch @@ -61,7 +61,7 @@ index 7b8a470d97ccf0fdcdb8eef9368195486e09913b..d1f9d2884d055efbe72b01f86b0bdaf1 static void a(ISourceBlock isourceblock, Entity entity, EnumDirection enumdirection) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a38cea444879becaa043f131b754f7d812375e6c..059c66a2d3f878cde8896c8f10f71bfecaea4685 100644 +index 87c68707aaab2d0e49d4e9c17de94b28a4324799..ade194e572b37365cc2becc69081bac8ca34ca46 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -251,8 +251,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0100-Allow-anvil-colors.patch b/patches/server/0100-Allow-anvil-colors.patch index fc55eeb12..447812994 100644 --- a/patches/server/0100-Allow-anvil-colors.patch +++ b/patches/server/0100-Allow-anvil-colors.patch @@ -35,7 +35,7 @@ index 4aa6b035a6a8ea39401c6566cd286de39f60e942..5e4e59e5c8478b76078fdda14e5ced76 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 059c66a2d3f878cde8896c8f10f71bfecaea4685..95d13aafc468532f66abd265657f463e361f2297 100644 +index ade194e572b37365cc2becc69081bac8ca34ca46..227bdc2d24d4d6dbacbf5b93497d1a4b61290af0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -234,6 +234,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0101-Add-no-tick-block-list.patch b/patches/server/0101-Add-no-tick-block-list.patch index 8e93e1121..f99fbf728 100644 --- a/patches/server/0101-Add-no-tick-block-list.patch +++ b/patches/server/0101-Add-no-tick-block-list.patch @@ -43,7 +43,7 @@ index 49ae8bd50810473d121e786a06a813b777909904..c92f3043f6993e569cf83ac69682b85e this.nextTickListFluid = new TickListServer<>(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 95d13aafc468532f66abd265657f463e361f2297..84db039126ab866aa2be4b7b1c0efa7e17573a54 100644 +index 227bdc2d24d4d6dbacbf5b93497d1a4b61290af0..5b344d7eb8e4c031deb660955f2d1914f3ce4800 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/0102-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0102-Add-option-to-disable-dolphin-treasure-searching.patch index dca424bdb..748e9e07c 100644 --- a/patches/server/0102-Add-option-to-disable-dolphin-treasure-searching.patch +++ b/patches/server/0102-Add-option-to-disable-dolphin-treasure-searching.patch @@ -17,7 +17,7 @@ index 2916ee89ef7a14619703dfbe7efd5c78a2f34337..664f9693368852bfb06a7a3bd0862a10 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 84db039126ab866aa2be4b7b1c0efa7e17573a54..33aae151c8d79bac8fb52f2c3f526d0017306098 100644 +index 5b344d7eb8e4c031deb660955f2d1914f3ce4800..07cc9766d420d5584c53692e37abaca5b5ac95f5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -353,6 +353,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0104-Stop-squids-floating-on-top-of-water.patch b/patches/server/0104-Stop-squids-floating-on-top-of-water.patch index f55934d77..be260dede 100644 --- a/patches/server/0104-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0104-Stop-squids-floating-on-top-of-water.patch @@ -43,7 +43,7 @@ index b21605a62365fe24f315f35bd840b4740fc80f0e..148e4b158734f136832e5c17bdc69634 protected void initPathfinder() { this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 33aae151c8d79bac8fb52f2c3f526d0017306098..94f11a3dc2a4e595e3fe9dffee3d31de0040292f 100644 +index 07cc9766d420d5584c53692e37abaca5b5ac95f5..637cac2758a44e72794953b9fbca2accb7d86b6a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -499,8 +499,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0105-Ridables.patch b/patches/server/0105-Ridables.patch index 51e6264c7..1a0e80ddf 100644 --- a/patches/server/0105-Ridables.patch +++ b/patches/server/0105-Ridables.patch @@ -3889,10 +3889,10 @@ index 8a1ff579ddf2fef191bc370dc51dd2e6404d9a22..3c14ed27e5b487451846f6811f189e6f } diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index 95ee716fc9b79b5fcb8508118b3876c51f3f6987..e980da14cf4f34c87a88ffd2b908223808404966 100644 +index 51396cbd18d0e053e788f82bf4a3bc2533f20e11..66a90507aaf16bb8512a77f3c9aa501697e49862 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java -@@ -14,12 +14,26 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt +@@ -13,12 +13,26 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt super(entitytypes, world); } @@ -3919,7 +3919,7 @@ index 95ee716fc9b79b5fcb8508118b3876c51f3f6987..e980da14cf4f34c87a88ffd2b9082238 this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget<>(this, EntityInsentient.class, 10, true, false, (entityliving) -> { return entityliving instanceof IMonster; })); -@@ -71,6 +85,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt +@@ -70,6 +84,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt return; } @@ -3927,7 +3927,7 @@ index 95ee716fc9b79b5fcb8508118b3876c51f3f6987..e980da14cf4f34c87a88ffd2b9082238 IBlockData iblockdata = Blocks.SNOW.getBlockData(); for (int l = 0; l < 4; ++l) { -@@ -113,7 +128,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt +@@ -112,7 +127,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt if (itemstack.getItem() == Items.SHEARS && this.canShear()) { // CraftBukkit start if (!CraftEventFactory.handlePlayerShearEntityEvent(entityhuman, this, itemstack, enumhand)) { @@ -3936,7 +3936,7 @@ index 95ee716fc9b79b5fcb8508118b3876c51f3f6987..e980da14cf4f34c87a88ffd2b9082238 } // CraftBukkit end this.shear(SoundCategory.PLAYERS); -@@ -141,7 +156,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt +@@ -132,7 +147,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt return EnumInteractionResult.SUCCESS; // Purpur end } else { @@ -5071,7 +5071,7 @@ index c314a8c9a921a95cea43b748e2037521d948e1e7..59f3122aab9940cb3c3c1efb2664ab08 public static int dungeonSeed = -1; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 94f11a3dc2a4e595e3fe9dffee3d31de0040292f..a70f8d6bd20bebb128ef0c232384f7d43e9b6e80 100644 +index 637cac2758a44e72794953b9fbca2accb7d86b6a..3d3505f538510fbef4a7d584fa5f03c48be184f7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -42,11 +42,6 @@ public class PurpurWorldConfig { @@ -5535,7 +5535,7 @@ index 94f11a3dc2a4e595e3fe9dffee3d31de0040292f..a70f8d6bd20bebb128ef0c232384f7d4 + public boolean snowGolemRidable = false; + public boolean snowGolemRidableInWater = false; + public boolean snowGolemLeaveTrailWhenRidden = false; - public boolean snowGolemDropsPumpkin = false; + public boolean snowGolemDropsPumpkin = true; public boolean snowGolemPutPumpkinBack = false; private void snowGolemSettings() { + snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable); diff --git a/patches/server/0108-Entities-can-use-portals-configuration.patch b/patches/server/0108-Entities-can-use-portals-configuration.patch index 946b3f468..fa616d1dc 100644 --- a/patches/server/0108-Entities-can-use-portals-configuration.patch +++ b/patches/server/0108-Entities-can-use-portals-configuration.patch @@ -27,7 +27,7 @@ index 0115e2c73eff9d5e4c6778e32fc54b9c116b6b22..e4f2e51b6306fcaf161b7dfb734d9d28 public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a70f8d6bd20bebb128ef0c232384f7d43e9b6e80..3ce06799d0c5798f094171b3c559b7eec65b66a3 100644 +index 3d3505f538510fbef4a7d584fa5f03c48be184f7..d0d220ece6596bbefcb428ffc94aff566ad6ef19 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -158,6 +158,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0110-Customizable-wither-health-and-healing.patch b/patches/server/0110-Customizable-wither-health-and-healing.patch index c08e9f50c..071a43f18 100644 --- a/patches/server/0110-Customizable-wither-health-and-healing.patch +++ b/patches/server/0110-Customizable-wither-health-and-healing.patch @@ -44,7 +44,7 @@ index 0442b722e5dc7ccc6e607fb3fa7766496b3398d5..9d67ce93573f85d64e8f0a8bd9434c13 //this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); // Paper - Moved down diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3ce06799d0c5798f094171b3c559b7eec65b66a3..789d471ae244f635fc393d0bf581189587a7ee57 100644 +index d0d220ece6596bbefcb428ffc94aff566ad6ef19..9ca3615cc66f4bca038f63add1dfb739d8b0a4c0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -919,10 +919,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0111-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0111-Allow-toggling-special-MobSpawners-per-world.patch index f7d64b0a0..90e760d45 100644 --- a/patches/server/0111-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0111-Allow-toggling-special-MobSpawners-per-world.patch @@ -72,7 +72,7 @@ index 5a6aace070e64b6db315d766d16773c408de638e..ded19d1773237eaf51f72ce93a6794db this.worldDataServer = (WorldDataServer) iworlddataserver; worldDataServer.world = this; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 789d471ae244f635fc393d0bf581189587a7ee57..c38f262a8151397be319f083ee6c201ccaf1a9ec 100644 +index 9ca3615cc66f4bca038f63add1dfb739d8b0a4c0..7843d6ed07ae928eb450b6604cf58900a71fc958 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -7,6 +7,8 @@ import net.minecraft.server.IRegistry; diff --git a/patches/server/0112-Raid-cooldown-setting.patch b/patches/server/0112-Raid-cooldown-setting.patch index 53e342176..41daf9508 100644 --- a/patches/server/0112-Raid-cooldown-setting.patch +++ b/patches/server/0112-Raid-cooldown-setting.patch @@ -52,7 +52,7 @@ index 826dcf9f7eedc3664d66170b97b2a19552a0dc60..807910c60e6cad58b91474b0477e6fc1 if (!this.raids.containsKey(raid.getId())) { this.raids.put(raid.getId(), raid); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c38f262a8151397be319f083ee6c201ccaf1a9ec..d7a4bf3ecb012adddbb9be2b42e9815c739659c7 100644 +index 7843d6ed07ae928eb450b6604cf58900a71fc958..9461f12a4c4e863f9e7e2d7fc0848f328f580339 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -173,6 +173,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0113-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0113-Despawn-rate-config-options-per-projectile-type.patch index cb82c85e9..e6424b931 100644 --- a/patches/server/0113-Despawn-rate-config-options-per-projectile-type.patch +++ b/patches/server/0113-Despawn-rate-config-options-per-projectile-type.patch @@ -300,7 +300,7 @@ index b7e540dfeeabb13227596ecfc6eddabf3cfde537..56adefabdfbf444e87129715f107c6d3 public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d7a4bf3ecb012adddbb9be2b42e9815c739659c7..fe0e89ec0daf03805a2d4c6a6a8096ce39556dd0 100644 +index 9461f12a4c4e863f9e7e2d7fc0848f328f580339..5da0cd476fd2d99bede6c4f897c93144cfeb7579 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -165,6 +165,35 @@ public class PurpurWorldConfig { diff --git a/patches/server/0115-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0115-Add-option-to-disable-zombie-aggressiveness-towards-.patch index 65c5e4030..2b5efca0b 100644 --- a/patches/server/0115-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/server/0115-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -69,7 +69,7 @@ index 7e1e056bdd966a14a184eb76717116998b6e5cb3..fd28ef623f8b6db5e36328d4ef2771e8 this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo)); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index fe0e89ec0daf03805a2d4c6a6a8096ce39556dd0..3d4e99bdab36ae51eb001ba40c30e56478b9eefd 100644 +index 5da0cd476fd2d99bede6c4f897c93144cfeb7579..6eb30ec9f9e25cb0d9a18cee49fb8ed6a3b00f95 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1021,12 +1021,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0116-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0116-Persistent-TileEntity-Lore-and-DisplayName.patch index 4105e8c4b..334e385fb 100644 --- a/patches/server/0116-Persistent-TileEntity-Lore-and-DisplayName.patch +++ b/patches/server/0116-Persistent-TileEntity-Lore-and-DisplayName.patch @@ -165,7 +165,7 @@ index 58d958a88ac5af5b889d719d9f1ea90ce45cf184..8e8749095427b44e04582593114cae8c + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3d4e99bdab36ae51eb001ba40c30e56478b9eefd..643dfd2f50939708fa6f3127ca371674f69f6527 100644 +index 6eb30ec9f9e25cb0d9a18cee49fb8ed6a3b00f95..203913c91d1c12a233a9c0af8b812752457b99e4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -200,6 +200,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0118-Flying-squids-Oh-my.patch b/patches/server/0118-Flying-squids-Oh-my.patch index a27cb0197..ef9d32fbd 100644 --- a/patches/server/0118-Flying-squids-Oh-my.patch +++ b/patches/server/0118-Flying-squids-Oh-my.patch @@ -38,7 +38,7 @@ index 70b952f10a2af547f58069977ee135469d02f84d..cee226501690e1c00983a01ac82bc738 float f1 = MathHelper.cos(f) * 0.2F; float f2 = -0.1F + this.b.getRandom().nextFloat() * 0.2F; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 643dfd2f50939708fa6f3127ca371674f69f6527..06c23ba2eefd1ed6b0deddd3aee3604fae58f493 100644 +index 203913c91d1c12a233a9c0af8b812752457b99e4..1ea4a9b5c710a188f8321406737400a3caeb3c94 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -877,10 +877,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0119-Infinity-bow-settings.patch b/patches/server/0119-Infinity-bow-settings.patch index e4f045835..6eaf7a0d4 100644 --- a/patches/server/0119-Infinity-bow-settings.patch +++ b/patches/server/0119-Infinity-bow-settings.patch @@ -26,7 +26,7 @@ index dd6a93dc78a4589f2c65d1738c432def1285f3e2..8241f3dafa5852bed7a3967e7260b36f entityhuman.b(StatisticList.ITEM_USED.b(this)); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 06c23ba2eefd1ed6b0deddd3aee3604fae58f493..52d172109df33fc96ddf00b340997f61a6f247ef 100644 +index 1ea4a9b5c710a188f8321406737400a3caeb3c94..65b9b55e9cfaa4d741a09249c54b9d64cab3e910 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -165,6 +165,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0120-Stonecutter-damage.patch b/patches/server/0120-Stonecutter-damage.patch index 3d2e8f600..9ea272199 100644 --- a/patches/server/0120-Stonecutter-damage.patch +++ b/patches/server/0120-Stonecutter-damage.patch @@ -39,7 +39,7 @@ index 33804e68931e8b4145b896eedeab79bde78779f2..fabadcd7a21b0e4ad0e2eeadcd8926df } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 52d172109df33fc96ddf00b340997f61a6f247ef..0ed9e5998d00365da1cca37c9980ff0c97b1549a 100644 +index 65b9b55e9cfaa4d741a09249c54b9d64cab3e910..a1c4a408abb729e2fa6e08aa57bcaaf2a2a2d065 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -383,6 +383,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0121-Configurable-daylight-cycle.patch b/patches/server/0121-Configurable-daylight-cycle.patch index 95007fecf..0c0ec51f9 100644 --- a/patches/server/0121-Configurable-daylight-cycle.patch +++ b/patches/server/0121-Configurable-daylight-cycle.patch @@ -74,7 +74,7 @@ index ded19d1773237eaf51f72ce93a6794db8f56d160..cb2c429bda81b8c151a50ef3627716fe public void doMobSpawning(boolean flag, boolean flag1) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0ed9e5998d00365da1cca37c9980ff0c97b1549a..4143e6d4900e1a774804e2ef69a820274cd36af1 100644 +index a1c4a408abb729e2fa6e08aa57bcaaf2a2a2d065..ef09664ad1521b17b99fa99f5a560167e4ca19b2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -116,6 +116,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0123-Infinite-fuel-furnace.patch b/patches/server/0123-Infinite-fuel-furnace.patch index 38a82135b..72f01689c 100644 --- a/patches/server/0123-Infinite-fuel-furnace.patch +++ b/patches/server/0123-Infinite-fuel-furnace.patch @@ -41,7 +41,7 @@ index e75e676d196d9f5a3409ec50645fab611b0afdad..76ea1d003b43d822e2b85eec3b874015 if (flag1) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4143e6d4900e1a774804e2ef69a820274cd36af1..ac6db65af48222bb3d5c2234e42eb57ef2c1588d 100644 +index ef09664ad1521b17b99fa99f5a560167e4ca19b2..8bd8a84bd14fff380662d19c1cbe6997a65fb33a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -351,6 +351,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0126-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0126-Ability-to-re-add-farmland-mechanics-from-Alpha.patch index e05f42dae..44b13ff51 100644 --- a/patches/server/0126-Ability-to-re-add-farmland-mechanics-from-Alpha.patch +++ b/patches/server/0126-Ability-to-re-add-farmland-mechanics-from-Alpha.patch @@ -24,7 +24,7 @@ index 8dd48669c29dd51ed4d535dad0b0319f4bb2250c..099e0d3df219408ebe2a741a02e53eb9 return; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ac6db65af48222bb3d5c2234e42eb57ef2c1588d..1db3c53b64a8cdd487e8672befa72fdda8eb30e5 100644 +index 8bd8a84bd14fff380662d19c1cbe6997a65fb33a..f8d7cefc1f231bfe6f09ff6bc01f00a7e3a90553 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -347,8 +347,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0127-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0127-Add-adjustable-breeding-cooldown-to-config.patch index e4370e532..c0e1f5d25 100644 --- a/patches/server/0127-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0127-Add-adjustable-breeding-cooldown-to-config.patch @@ -94,7 +94,7 @@ index ded92fe7c7871bae6e9741747a67636d570cdeef..7c367fe6152c30aab3e53c8f88cceba6 this.generator = gen; this.world = new CraftWorld((WorldServer) this, gen, env); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1db3c53b64a8cdd487e8672befa72fdda8eb30e5..bc2b6e5b1b7253a64224f39ab0d39bcbd2e77996 100644 +index f8d7cefc1f231bfe6f09ff6bc01f00a7e3a90553..a70bd4fdb0634110bc2b68780c28d4a2b788e1e6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -220,6 +220,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0128-Make-animal-breeding-times-configurable.patch b/patches/server/0128-Make-animal-breeding-times-configurable.patch index 124b18d21..2ec510f13 100644 --- a/patches/server/0128-Make-animal-breeding-times-configurable.patch +++ b/patches/server/0128-Make-animal-breeding-times-configurable.patch @@ -398,7 +398,7 @@ index 9ae7168595dd66860e09ef87f946b18b010e54b1..6c25f667eecdf345289a0dbf885c9d71 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index bc2b6e5b1b7253a64224f39ab0d39bcbd2e77996..280cc66097fc2161a5905ae3e308b0571172afe0 100644 +index a70bd4fdb0634110bc2b68780c28d4a2b788e1e6..9947b5ad48ff24f79f900aa59ae39364db44576b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -434,10 +434,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0129-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0129-Apply-display-names-from-item-forms-of-entities-to-e.patch index f38a90392..ba53ec2a1 100644 --- a/patches/server/0129-Apply-display-names-from-item-forms-of-entities-to-e.patch +++ b/patches/server/0129-Apply-display-names-from-item-forms-of-entities-to-e.patch @@ -188,7 +188,7 @@ index a4edfb02fd350433020b0f3699726b6127ab9933..3f9062d8eca3ce53c0fb9e9e40330aa4 NBTTagCompound nbttagcompound = this.a("display"); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 280cc66097fc2161a5905ae3e308b0571172afe0..14440adbca4d589e172e67b669d4d5799286d085 100644 +index 9947b5ad48ff24f79f900aa59ae39364db44576b..e7817f9dfdf809a5d6d15cf28aedcc9ed1c7ca72 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -83,8 +83,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0130-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0130-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch index 8b90be23f..1a5056007 100644 --- a/patches/server/0130-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch +++ b/patches/server/0130-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch @@ -21,7 +21,7 @@ index 01163ce38602f9345f00ee0535b4e73be7c6d735..a7efce97318fcf95d98f33ad4ac2da69 ((EntityInsentient) entityliving).setPersistent(); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 14440adbca4d589e172e67b669d4d5799286d085..3d3d718bff710f0ea9e699e2acc82c4c68e65f3d 100644 +index e7817f9dfdf809a5d6d15cf28aedcc9ed1c7ca72..d9f385d97887110558747ef16a13e42a0115e5bd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -84,9 +84,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0131-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0131-Add-twisting-and-weeping-vines-growth-rates.patch index a0a40bd71..2654f08e7 100644 --- a/patches/server/0131-Add-twisting-and-weeping-vines-growth-rates.patch +++ b/patches/server/0131-Add-twisting-and-weeping-vines-growth-rates.patch @@ -67,7 +67,7 @@ index 23dca1940375d243531fc4a891f04e937ae2f48f..94ffadb91fec65a721cf0c8fa98bad70 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3d3d718bff710f0ea9e699e2acc82c4c68e65f3d..bc09361580b85c3eff533c6dd245e8fc219f2a5f 100644 +index d9f385d97887110558747ef16a13e42a0115e5bd..eb04a84ecd69c8c64857d509c4629f599055c6e6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -419,6 +419,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0132-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0132-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch index 824c4b114..c9548cef4 100644 --- a/patches/server/0132-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch +++ b/patches/server/0132-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch @@ -89,7 +89,7 @@ index 94ffadb91fec65a721cf0c8fa98bad708a2ca269..067df63ab27ecb9fe0a0d012b16efbd5 // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index bc09361580b85c3eff533c6dd245e8fc219f2a5f..1f00fc0aede9841316830bc350ec9a4db0881764 100644 +index eb04a84ecd69c8c64857d509c4629f599055c6e6..95fd7fddba102965b1948214c9ceeee3e9ba41f8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -366,6 +366,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0133-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0133-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch index 1ee9ef60c..0781971b2 100644 --- a/patches/server/0133-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch +++ b/patches/server/0133-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch @@ -21,7 +21,7 @@ index 995849212c25568d3aa28ada78babf8b8e669960..acb2b3ed04ea0bf19335415310ce22cd static class PathfinderGoalEndermanPickupBlock extends PathfinderGoal { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1f00fc0aede9841316830bc350ec9a4db0881764..858363deaad76ea1837f90394a1009db6a42a166 100644 +index 95fd7fddba102965b1948214c9ceeee3e9ba41f8..95202b48e08971bb096f01899a8a250e794777fe 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -588,10 +588,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0135-Add-configurable-snowball-damage.patch b/patches/server/0135-Add-configurable-snowball-damage.patch index 4e6f176d9..745521c4c 100644 --- a/patches/server/0135-Add-configurable-snowball-damage.patch +++ b/patches/server/0135-Add-configurable-snowball-damage.patch @@ -18,7 +18,7 @@ index 34a5f481e6ed1357861dca15fb4013ec8484a292..d7bab4446a5a8eef98c10b1f6eb89de9 entity.damageEntity(DamageSource.projectile(this, this.getShooter()), (float) i); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 858363deaad76ea1837f90394a1009db6a42a166..f4abaeaa36f97c8cae0507c7746cd960a5fc35fc 100644 +index 95202b48e08971bb096f01899a8a250e794777fe..ad799b1abc425b78ae2435001ec591660b3965b2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -214,6 +214,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0136-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0136-Zombie-break-door-minimum-difficulty-option.patch index ea4d67102..c7ed0485a 100644 --- a/patches/server/0136-Zombie-break-door-minimum-difficulty-option.patch +++ b/patches/server/0136-Zombie-break-door-minimum-difficulty-option.patch @@ -40,7 +40,7 @@ index 7488a12926c5ee4adc3bc1fa3973988350381544..23870a271b759a953a095df835e08ea2 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f4abaeaa36f97c8cae0507c7746cd960a5fc35fc..afe772f6249f3901a5057684fcce89053237bc13 100644 +index ad799b1abc425b78ae2435001ec591660b3965b2..53f0fbb036d45749190d078282d0e92e87b83269 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -2,6 +2,7 @@ package net.pl3x.purpur; diff --git a/patches/server/0140-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0140-Changeable-Mob-Left-Handed-Chance.patch index 45d9bc11c..ac8eabd84 100644 --- a/patches/server/0140-Changeable-Mob-Left-Handed-Chance.patch +++ b/patches/server/0140-Changeable-Mob-Left-Handed-Chance.patch @@ -18,7 +18,7 @@ index 498665a83b6add97873446fff7e7ee66e73699ac..523fdb6a73a918bc04cbc88a440e72a1 } else { this.setLeftHanded(false); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index afe772f6249f3901a5057684fcce89053237bc13..39d8752a673f10cd95a28e091ab8d5d7f626ebbd 100644 +index 53f0fbb036d45749190d078282d0e92e87b83269..d58cba46018b4ce96eb3d88450eed098825c03b1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -129,8 +129,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0141-Add-boat-fall-damage-config.patch b/patches/server/0141-Add-boat-fall-damage-config.patch index 032cf1394..22d19d713 100644 --- a/patches/server/0141-Add-boat-fall-damage-config.patch +++ b/patches/server/0141-Add-boat-fall-damage-config.patch @@ -27,7 +27,7 @@ index c8a4de0b45ea25a0c96dda90aa8d2400b32a4589..a95dbbdb1a3ce4f403eab793ec5d6820 if (!flag && isSpawnInvulnerable() && damagesource != DamageSource.OUT_OF_WORLD) { // Purpur diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 39d8752a673f10cd95a28e091ab8d5d7f626ebbd..904a49a96a6b410046846ec48a3d1817d1d6879d 100644 +index d58cba46018b4ce96eb3d88450eed098825c03b1..e6dc9c07ecf26c68510ed1aed7888d2192e6d54b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -224,6 +224,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0142-Config-migration-disable-saving-projectiles-to-disk-.patch b/patches/server/0142-Config-migration-disable-saving-projectiles-to-disk-.patch index 365632f7e..7e03629d3 100644 --- a/patches/server/0142-Config-migration-disable-saving-projectiles-to-disk-.patch +++ b/patches/server/0142-Config-migration-disable-saving-projectiles-to-disk-.patch @@ -36,7 +36,7 @@ index 9294bfab12ef88690e359ff90551c5c615cdd3dd..e928716d7a2dcb390507b746763e6f7e public static String afkBroadcastBack = "§e§o%s is no longer AFK"; public static String afkTabListPrefix = "[AFK] "; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 904a49a96a6b410046846ec48a3d1817d1d6879d..22a930a42e10447216c6c60bab5772f1c7c2fed1 100644 +index e6dc9c07ecf26c68510ed1aed7888d2192e6d54b..2b406c22f7d481fb9e62f8b1b7e317edf7543a84 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0143-Snow-Golem-rate-of-fire-config.patch b/patches/server/0143-Snow-Golem-rate-of-fire-config.patch index 243055b2b..adcc0609e 100644 --- a/patches/server/0143-Snow-Golem-rate-of-fire-config.patch +++ b/patches/server/0143-Snow-Golem-rate-of-fire-config.patch @@ -10,10 +10,10 @@ If min-shoot-interval-ticks and max-shoot-interval-ticks are both set to 0, snow golems won't shoot any snowballs. diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index e980da14cf4f34c87a88ffd2b908223808404966..e5b3d298f52006f39a36cfdd95097e7b4f89939a 100644 +index 66a90507aaf16bb8512a77f3c9aa501697e49862..4c083bcfe7d083713b418486f0918f39b96bdb65 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java -@@ -29,7 +29,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt +@@ -28,7 +28,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt @Override protected void initPathfinder() { this.goalSelector.a(0, new PathfinderGoalHasRider(this)); // Purpur @@ -23,12 +23,12 @@ index e980da14cf4f34c87a88ffd2b908223808404966..e5b3d298f52006f39a36cfdd95097e7b this.goalSelector.a(3, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F)); this.goalSelector.a(4, new PathfinderGoalRandomLookaround(this)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 22a930a42e10447216c6c60bab5772f1c7c2fed1..6794e9f57ec599128c9b65f2940f71f230f2715a 100644 +index 2b406c22f7d481fb9e62f8b1b7e317edf7543a84..9922410c8d11acca6ba774bca40804091b95d12e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -979,12 +979,20 @@ public class PurpurWorldConfig { public boolean snowGolemLeaveTrailWhenRidden = false; - public boolean snowGolemDropsPumpkin = false; + public boolean snowGolemDropsPumpkin = true; public boolean snowGolemPutPumpkinBack = false; + public int snowGolemSnowBallMin = 20; + public int snowGolemSnowBallMax = 20; diff --git a/patches/server/0146-Config-migration-climbing-should-not-bypass-cramming.patch b/patches/server/0146-Config-migration-climbing-should-not-bypass-cramming.patch index 70ca18ae5..e5c5a004b 100644 --- a/patches/server/0146-Config-migration-climbing-should-not-bypass-cramming.patch +++ b/patches/server/0146-Config-migration-climbing-should-not-bypass-cramming.patch @@ -28,7 +28,7 @@ index 7aee1687571010da55e8bb776ec1c658748e979a..645213cacb6061f84da7a1c9d6f2fa94 public static String afkBroadcastBack = "§e§o%s is no longer AFK"; public static String afkTabListPrefix = "[AFK] "; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6794e9f57ec599128c9b65f2940f71f230f2715a..3bcf4a471ed4eb049e5facb3bfb22f133d0444a3 100644 +index 9922410c8d11acca6ba774bca40804091b95d12e..4b5c42d78f8e62fd2260778b3170d3eb2ebaea83 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -96,6 +96,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0147-Lobotomize-stuck-villagers.patch b/patches/server/0147-Lobotomize-stuck-villagers.patch index f52cfed18..f3598b4df 100644 --- a/patches/server/0147-Lobotomize-stuck-villagers.patch +++ b/patches/server/0147-Lobotomize-stuck-villagers.patch @@ -88,7 +88,7 @@ index b92ca4a6de01f3f86367fb8dfe3591b08a3e9218..1208464fba96daf276c9cc0c1c9b18db // Paper start - add target parameter return this.a(blockposition, null, i); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3bcf4a471ed4eb049e5facb3bfb22f133d0444a3..7bc193aae13003a2094b937c2899c55dfb9a5107 100644 +index 4b5c42d78f8e62fd2260778b3170d3eb2ebaea83..46859afbf3c2cbc5718e240f7965288549e915a9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1073,6 +1073,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0148-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0148-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index c9cd15e9d..2d3fbffc5 100644 --- a/patches/server/0148-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0148-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -234,7 +234,7 @@ index 3c60da7ac6faebe9d964e893974e42613c59b4c1..6493f220a0cf627e82e5f3f3c85e9934 public static final VillagerProfession FISHERMAN = a("fisherman", VillagePlaceType.i, SoundEffects.ENTITY_VILLAGER_WORK_FISHERMAN); public static final VillagerProfession FLETCHER = a("fletcher", VillagePlaceType.j, SoundEffects.ENTITY_VILLAGER_WORK_FLETCHER); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7bc193aae13003a2094b937c2899c55dfb9a5107..110690251fc3e76f7f16f5614e1dca3c0754ebb8 100644 +index 46859afbf3c2cbc5718e240f7965288549e915a9..b8dcb9c48ed8cac881b4bb1b4d995966d15f44eb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1075,6 +1075,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0149-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0149-Toggle-for-Zombified-Piglin-death-always-counting-as.patch index 8890512db..6c94b686f 100644 --- a/patches/server/0149-Toggle-for-Zombified-Piglin-death-always-counting-as.patch +++ b/patches/server/0149-Toggle-for-Zombified-Piglin-death-always-counting-as.patch @@ -35,7 +35,7 @@ index 3327dbbf87d8f43cbc7cd728df2f4c6a33dae40d..57f3358b8dfd53f5b1d2e976d64b809f } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 110690251fc3e76f7f16f5614e1dca3c0754ebb8..3a58c970dae6dca0a97e7f2ed3eb0bcadcd65e4a 100644 +index b8dcb9c48ed8cac881b4bb1b4d995966d15f44eb..7ec9a135778c685344d22ddba02c0858872c50fa 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1206,12 +1206,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0151-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0151-Configurable-chance-for-wolves-to-spawn-rabid.patch index 564e6b471..357402515 100644 --- a/patches/server/0151-Configurable-chance-for-wolves-to-spawn-rabid.patch +++ b/patches/server/0151-Configurable-chance-for-wolves-to-spawn-rabid.patch @@ -201,7 +201,7 @@ index 9a4819815c7a4bf2fd4a92c4169ace35f2261704..da29898574d30d5fecc5a44ad7b36556 public PathfinderGoalAvoidTarget(EntityCreature entitycreature, Class oclass, Predicate predicate, float f, double d0, double d1, Predicate predicate1) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3a58c970dae6dca0a97e7f2ed3eb0bcadcd65e4a..533e9aedc69645e6c2d16dbf2abb767b9826feb6 100644 +index 7ec9a135778c685344d22ddba02c0858872c50fa..7fb9ceba6cb35fb0a2ae782abc1ebc1f56c0d55a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1157,10 +1157,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0152-Configurable-default-wolf-collar-color.patch b/patches/server/0152-Configurable-default-wolf-collar-color.patch index 100c24b06..54704114c 100644 --- a/patches/server/0152-Configurable-default-wolf-collar-color.patch +++ b/patches/server/0152-Configurable-default-wolf-collar-color.patch @@ -24,7 +24,7 @@ index 5fe2e9f4bfbdc08690eacd6196e59529dc7953e8..fd62dc51258876275adbe02f750fd881 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 533e9aedc69645e6c2d16dbf2abb767b9826feb6..2d177f9583798d56fae2d08ad2b4805a91585698 100644 +index 7fb9ceba6cb35fb0a2ae782abc1ebc1f56c0d55a..878c5f324484bbd401ea177fda6b1b5e53aaf778 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -3,6 +3,7 @@ package net.pl3x.purpur; diff --git a/patches/server/0153-Configurable-entity-base-attributes.patch b/patches/server/0153-Configurable-entity-base-attributes.patch index e5fea2e3d..95a90fbde 100644 --- a/patches/server/0153-Configurable-entity-base-attributes.patch +++ b/patches/server/0153-Configurable-entity-base-attributes.patch @@ -1037,10 +1037,10 @@ index 3c14ed27e5b487451846f6811f189e6fba05d32d..36b384fd8fc29b270bb8c0ccc66ffad1 this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue((double) i); if (flag) { diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index e5b3d298f52006f39a36cfdd95097e7b4f89939a..319bb68f27f360bb36897c73a68ddeac64b67a6f 100644 +index 4c083bcfe7d083713b418486f0918f39b96bdb65..fa0c459dcd773e003a2852c594ec7254e4eb11b8 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java -@@ -24,6 +24,11 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt +@@ -23,6 +23,11 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt public boolean isRidableInWater() { return world.purpurConfig.snowGolemRidableInWater; } @@ -1314,7 +1314,7 @@ index 0c47477b416980d2e932321730525bf5a8feda4f..dc850677c29c16805f28af00b2a63363 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2d177f9583798d56fae2d08ad2b4805a91585698..555121ff9f3b6b666a5e1396d04870d6d725df75 100644 +index 878c5f324484bbd401ea177fda6b1b5e53aaf778..a9953a72055d23354b72f9800625a745c7d4eada 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -484,30 +484,58 @@ public class PurpurWorldConfig { diff --git a/patches/server/0154-Phantom-flames-on-swoop.patch b/patches/server/0154-Phantom-flames-on-swoop.patch index cf7daadfb..7342a7e65 100644 --- a/patches/server/0154-Phantom-flames-on-swoop.patch +++ b/patches/server/0154-Phantom-flames-on-swoop.patch @@ -17,7 +17,7 @@ index 25345d8d585735af407787f2c26fe92674721239..087a91fedc49aaf6e74b81b90494849c @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 555121ff9f3b6b666a5e1396d04870d6d725df75..e0f6b31cff0dbe99ed327fdb0df3caf1b0e392b9 100644 +index a9953a72055d23354b72f9800625a745c7d4eada..c96d20c5a4b2885cc0f1417de961a381ef44f7d2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1147,6 +1147,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0155-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0155-Option-for-chests-to-open-even-with-a-solid-block-on.patch index 624a89e74..338b51332 100644 --- a/patches/server/0155-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0155-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -17,7 +17,7 @@ index c4ff93a6b908c1bd157c7fe45b504909b189d09c..71a32a317e38b9c8f802fd5dd9ae546f return iblockaccess.getType(blockposition1).isOccluding(iblockaccess, blockposition1); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e0f6b31cff0dbe99ed327fdb0df3caf1b0e392b9..9ccf82239a3c5ee319ef64e9e5519c563e8dbcbd 100644 +index c96d20c5a4b2885cc0f1417de961a381ef44f7d2..fbcf02831d1ca663c85988a53f8593c7e999178d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -381,6 +381,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0157-Striders-give-saddle-back.patch b/patches/server/0157-Striders-give-saddle-back.patch index ca22e703d..52a0499a7 100644 --- a/patches/server/0157-Striders-give-saddle-back.patch +++ b/patches/server/0157-Striders-give-saddle-back.patch @@ -28,7 +28,7 @@ index 1bca386b7dea01af88a6c8d8e87ff11a0b21cc7a..964956a0027bf0941ff75d658be760b7 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9ccf82239a3c5ee319ef64e9e5519c563e8dbcbd..8aa4a08f4b8af273ea2f3e32066faec597e36015 100644 +index fbcf02831d1ca663c85988a53f8593c7e999178d..c3085b3c82f39b9b3343c36c0659e21ee4e8f70c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1500,11 +1500,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0159-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0159-Full-netherite-armor-grants-fire-resistance.patch index 320af5d88..a8fcdd2b3 100644 --- a/patches/server/0159-Full-netherite-armor-grants-fire-resistance.patch +++ b/patches/server/0159-Full-netherite-armor-grants-fire-resistance.patch @@ -26,7 +26,7 @@ index b6bfd8f5073ce481dfe2b1667ece42d32eaeb227..81f7d5bc581b42289a79121da1586899 protected ItemCooldown i() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8aa4a08f4b8af273ea2f3e32066faec597e36015..abea37ca263b718f08ad3dd1f931acfb366962b8 100644 +index c3085b3c82f39b9b3343c36c0659e21ee4e8f70c..5c82f785e0dd5c0015d2e46ba1b93b784d91030a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -310,6 +310,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch index f61c9bbaa..f0235af57 100644 --- a/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch @@ -233,10 +233,10 @@ index 4ed7a20bfed267776628457a4b33178bac7d1972..e7e12ce2338102b875444c3f3cc76785 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index 319bb68f27f360bb36897c73a68ddeac64b67a6f..550decf12140596e63b57a7ee5940e4f7b7dbc0b 100644 +index fa0c459dcd773e003a2852c594ec7254e4eb11b8..88eeabeb89fe733c462a667d7564da3b125952a2 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java -@@ -86,7 +86,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt +@@ -85,7 +85,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt this.damageEntity(CraftEventFactory.MELTING, 1.0F); // CraftBukkit - DamageSource.BURN -> CraftEventFactory.MELTING } @@ -338,7 +338,7 @@ index c03ebbc933197be3e7097ea3f7b7cd08c90db7bb..37c1d1ac1bfcaf84d00135ad3c9d9e9b } else if (this.c > 0) { --this.c; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index abea37ca263b718f08ad3dd1f931acfb366962b8..6a63ea0dbc48c69ebb12bb19e2e832e78fea2726 100644 +index 5c82f785e0dd5c0015d2e46ba1b93b784d91030a..c156f89e74e7db776fdfcfb2f7b30b4326fc0506 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -252,6 +252,7 @@ public class PurpurWorldConfig { @@ -514,7 +514,7 @@ index abea37ca263b718f08ad3dd1f931acfb366962b8..6a63ea0dbc48c69ebb12bb19e2e832e7 public boolean snowGolemRidableInWater = false; public boolean snowGolemLeaveTrailWhenRidden = false; + public boolean snowGolemBypassMobGriefing = false; - public boolean snowGolemDropsPumpkin = false; + public boolean snowGolemDropsPumpkin = true; public boolean snowGolemPutPumpkinBack = false; public int snowGolemSnowBallMin = 20; @@ -1450,6 +1475,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0163-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0163-Config-to-allow-Note-Block-sounds-when-blocked.patch index 5956c0040..247db7ab1 100644 --- a/patches/server/0163-Config-to-allow-Note-Block-sounds-when-blocked.patch +++ b/patches/server/0163-Config-to-allow-Note-Block-sounds-when-blocked.patch @@ -22,7 +22,7 @@ index df69d00d3a38417e53f433cd1eb1f6cf3ec9b55b..6bb6e229c8734d7b9f4e3cd3dd1b4b64 org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.get(BlockNote.INSTRUMENT), data.get(BlockNote.NOTE)); if (!event.isCancelled()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6a63ea0dbc48c69ebb12bb19e2e832e78fea2726..4d5d6102e3e9931086b1c6dfa1cf5031bb82f7c3 100644 +index c156f89e74e7db776fdfcfb2f7b30b4326fc0506..5b69a3c3aa7fc830e3471ef7b99c8c4d38178127 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -254,6 +254,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0164-Add-EntityTeleportHinderedEvent.patch b/patches/server/0164-Add-EntityTeleportHinderedEvent.patch index 9bb6cf4f3..a78baa6ae 100644 --- a/patches/server/0164-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0164-Add-EntityTeleportHinderedEvent.patch @@ -94,7 +94,7 @@ index ed8e91bf6c8b9d410d439bdddd5067d346a20a7e..127b5d8215f2bb4c5c523c5a77ebccfb if (this.exitPortal == null && this.world.getTypeKey() == DimensionManager.THE_END) { // CraftBukkit - work in alternate worlds this.a((WorldServer) this.world); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4d5d6102e3e9931086b1c6dfa1cf5031bb82f7c3..4d1851d23f27f58299f72f4bc14e7c99c69245d2 100644 +index 5b69a3c3aa7fc830e3471ef7b99c8c4d38178127..14e80ed8cb3c0cacef8c7a5d44cda9805249ed03 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1877,4 +1877,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0166-Farmland-trampling-changes.patch b/patches/server/0166-Farmland-trampling-changes.patch index 1513b0907..78004a319 100644 --- a/patches/server/0166-Farmland-trampling-changes.patch +++ b/patches/server/0166-Farmland-trampling-changes.patch @@ -28,7 +28,7 @@ index 73dc0f499c456c21d298013fbab8c79ebcdecd6b..6b65a4b1845c6770f92ceebd04827595 if (CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, Blocks.DIRT.getBlockData()).isCancelled()) { return; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4d1851d23f27f58299f72f4bc14e7c99c69245d2..5699d54d9ffd1f194a22fe03ad4d144d3ad5a007 100644 +index 14e80ed8cb3c0cacef8c7a5d44cda9805249ed03..8ce8f9eaf9b41003bbfa3acc4f7cbd8329d1b9b2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -413,10 +413,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0167-Movement-options-for-armour-stands.patch b/patches/server/0167-Movement-options-for-armour-stands.patch index 9322086b5..ce3a62a47 100644 --- a/patches/server/0167-Movement-options-for-armour-stands.patch +++ b/patches/server/0167-Movement-options-for-armour-stands.patch @@ -66,7 +66,7 @@ index 759a8f95038778aead2f33a65a2d8f2d6b26a765..74fda434ed7beb6612f46ed75fdccad5 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5699d54d9ffd1f194a22fe03ad4d144d3ad5a007..403c1a4db53ea9919d14910a7dd3db9e37040507 100644 +index 8ce8f9eaf9b41003bbfa3acc4f7cbd8329d1b9b2..87f1af12abe92d10dcab532715d10c39f95119b7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -111,10 +111,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0168-Fix-stuck-in-portals.patch b/patches/server/0168-Fix-stuck-in-portals.patch index 297f93c4d..49a6252cc 100644 --- a/patches/server/0168-Fix-stuck-in-portals.patch +++ b/patches/server/0168-Fix-stuck-in-portals.patch @@ -37,7 +37,7 @@ index a95dbbdb1a3ce4f403eab793ec5d6820678a2116..ebff0ef7f9bf38562265fc2cd4f81f59 // CraftBukkit end this.spawnIn(worldserver); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 403c1a4db53ea9919d14910a7dd3db9e37040507..1789c55df554335bacafba0b07bf10db09909693 100644 +index 87f1af12abe92d10dcab532715d10c39f95119b7..ed9703608467aa99f5cef6a6154fdf05efdbe0f7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -350,6 +350,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0170-Config-to-use-infinity-bows-without-arrows.patch b/patches/server/0170-Config-to-use-infinity-bows-without-arrows.patch index 0130ac1c8..eeb8cc3c3 100644 --- a/patches/server/0170-Config-to-use-infinity-bows-without-arrows.patch +++ b/patches/server/0170-Config-to-use-infinity-bows-without-arrows.patch @@ -20,7 +20,7 @@ index 8241f3dafa5852bed7a3967e7260b36f47198dba..edfb09fe673a9a7fe4e0410c0c0eeeda } else { entityhuman.c(enumhand); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1789c55df554335bacafba0b07bf10db09909693..074ebb5ee808875b1a90b70e42ef440af002f5c6 100644 +index ed9703608467aa99f5cef6a6154fdf05efdbe0f7..0747718f8705f5f56089e83e8344ad93b0055a15 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -209,10 +209,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0171-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0171-Toggle-for-water-sensitive-mob-damage.patch index eed125051..1f1fb45bb 100644 --- a/patches/server/0171-Toggle-for-water-sensitive-mob-damage.patch +++ b/patches/server/0171-Toggle-for-water-sensitive-mob-damage.patch @@ -57,10 +57,10 @@ index 330f27f649a2ab1567ebc1b547f1f2a5ce645055..5f9d8999ae7a1d742918e58c0f1bb36f return false; } diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java -index 550decf12140596e63b57a7ee5940e4f7b7dbc0b..286c956bc56ff2adc75b35ac8bfaaf985d9e3368 100644 +index 88eeabeb89fe733c462a667d7564da3b125952a2..2c22447c361962d76e0e18986e5406eb635ab46f 100644 --- a/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java -@@ -71,7 +71,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt +@@ -70,7 +70,7 @@ public class EntitySnowman extends EntityGolem implements IShearable, IRangedEnt @Override public boolean dO() { @@ -83,7 +83,7 @@ index 964956a0027bf0941ff75d658be760b754772fa0..7c5472a5138011a3376b7b6ec2467bdf @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 074ebb5ee808875b1a90b70e42ef440af002f5c6..42e09d1a20de61b68fedd4ca56517e06aa18f173 100644 +index 0747718f8705f5f56089e83e8344ad93b0055a15..ad6f5bf3a2f0734ffeba044025a52fd15e9970fb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -569,6 +569,7 @@ public class PurpurWorldConfig {