mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-06 19:00:16 +01:00
52 lines
3.3 KiB
Diff
52 lines
3.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index b48067c71f9de18ba40e970e2832f6245984a218..23a23e2ea133ce81d3dedc4ffd17435a995497ef 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -363,6 +363,14 @@ public class PaperWorldConfig {
|
||
|
|
log("Creeper lingering effect: " + disableCreeperLingeringEffect);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public boolean zombiesAlwaysCanPickUpLoot;
|
||
|
|
+ public boolean skeletonsAlwaysCanPickUpLoot;
|
||
|
|
+ private void setMobsAlwaysCanPickUpLoot() {
|
||
|
|
+ zombiesAlwaysCanPickUpLoot = getBoolean("mobs-can-always-pick-up-loot.zombies", false);
|
||
|
|
+ skeletonsAlwaysCanPickUpLoot = getBoolean("mobs-can-always-pick-up-loot.skeletons", false);
|
||
|
|
+ log("Zombies can always pick up loot: " + zombiesAlwaysCanPickUpLoot + ". Skeletons can always pick up loot: " + skeletonsAlwaysCanPickUpLoot + ".");
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
public int expMergeMaxValue;
|
||
|
|
private void expMergeMaxValue() {
|
||
|
|
expMergeMaxValue = getInt("experience-merge-max-value", -1);
|
||
|
|
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 76027a7c9615495af64102744e264d7ba7c9b87e..68e52e3a31e70569d1a92602aff4b7b81c594757 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
|
||
|
|
@@ -149,7 +149,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
|
||
|
|
this.populateDefaultEquipmentSlots(difficulty);
|
||
|
|
this.populateDefaultEquipmentEnchantments(difficulty);
|
||
|
|
this.reassessWeaponGoal();
|
||
|
|
- this.setCanPickUpLoot(this.random.nextFloat() < 0.55F * difficulty.getSpecialMultiplier());
|
||
|
|
+ this.setCanPickUpLoot(this.level.paperConfig.skeletonsAlwaysCanPickUpLoot || this.random.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 77634a1e8e7539000f7db0b96f4548137af1a819..74fd175c4dc2d0d9832ee41efaf065b75a43f4b8 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
||
|
|
@@ -494,7 +494,7 @@ public class Zombie extends Monster {
|
||
|
|
Object object = super.finalizeSpawn(world, difficulty, spawnReason, entityData, entityTag);
|
||
|
|
float f = difficulty.getSpecialMultiplier();
|
||
|
|
|
||
|
|
- this.setCanPickUpLoot(this.random.nextFloat() < 0.55F * f);
|
||
|
|
+ this.setCanPickUpLoot(this.level.paperConfig.zombiesAlwaysCanPickUpLoot || this.random.nextFloat() < 0.55F * f); // Paper
|
||
|
|
if (object == null) {
|
||
|
|
object = new Zombie.ZombieGroupData(getSpawnAsBabyOdds(world.getRandom()), true);
|
||
|
|
}
|