aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2023-07-04 10:22:56 +0200
committerGitHub <[email protected]>2023-07-04 10:22:56 +0200
commitc0936a71bd762a5a87425a24cfb9daff7418a4d4 (patch)
treee0fdbf09ef0ac1ae127f76a03bd8bb5132fa5c54 /patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch
parent4356758b645f3d4d91268ac40cd3b682eb3faecf (diff)
downloadPaper-c0936a71bd762a5a87425a24cfb9daff7418a4d4.tar.gz
Paper-c0936a71bd762a5a87425a24cfb9daff7418a4d4.zip
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
Diffstat (limited to 'patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch')
-rw-r--r--patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch
new file mode 100644
index 0000000000..7228b93ce4
--- /dev/null
+++ b/patches/server/0526-Added-world-settings-for-mobs-picking-up-loot.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 28 Nov 2020 18:43:52 -0800
+Subject: [PATCH] Added world settings for mobs picking up loot
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+index 4ea7a6bd6fdc98bef30546e19e2676a78fb29007..ef525e5f523966c9af7380e8d09ff5092e56e7c5 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
++++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+@@ -153,7 +153,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+ this.populateDefaultEquipmentSlots(randomsource, difficulty);
+ this.populateDefaultEquipmentEnchantments(randomsource, difficulty);
+ this.reassessWeaponGoal();
+- this.setCanPickUpLoot(randomsource.nextFloat() < 0.55F * difficulty.getSpecialMultiplier());
++ this.setCanPickUpLoot(this.level().paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.skeletons || randomsource.nextFloat() < 0.55F * difficulty.getSpecialMultiplier()); // Paper
+ if (this.getItemBySlot(EquipmentSlot.HEAD).isEmpty()) {
+ LocalDate localdate = LocalDate.now();
+ int i = localdate.get(ChronoField.DAY_OF_MONTH);
+diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+index 3ca308bb6668392a4f7ce1296e1ef6094060491f..0911a232dcc334503dbeb5f8198d2acc75a954f0 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+@@ -514,7 +514,7 @@ public class Zombie extends Monster {
+ Object object = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityNbt);
+ float f = difficulty.getSpecialMultiplier();
+
+- this.setCanPickUpLoot(randomsource.nextFloat() < 0.55F * f);
++ this.setCanPickUpLoot(this.level().paperConfig().entities.behavior.mobsCanAlwaysPickUpLoot.zombies || randomsource.nextFloat() < 0.55F * f); // Paper
+ if (object == null) {
+ object = new Zombie.ZombieGroupData(Zombie.getSpawnAsBabyOdds(randomsource), true);
+ }