2021-07-22 04:58:24 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Tue, 20 Jul 2021 21:25:35 -0700
|
|
|
|
Subject: [PATCH] Add a bunch of missing forceDrop toggles
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
2021-12-08 19:25:57 +01:00
|
|
|
index 0909d3cd41fa8c8fe971e1a6c5a67bab7e0a3dc9..6604cd4c65abd591a93620a1928e7b2635f0a38e 100644
|
2021-07-22 04:58:24 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
2021-12-08 19:25:57 +01:00
|
|
|
@@ -1491,7 +1491,9 @@ public abstract class Mob extends LivingEntity {
|
2021-07-22 04:58:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (this.tickCount > 100) {
|
|
|
|
+ this.forceDrops = true; // Paper
|
|
|
|
this.spawnAtLocation((ItemLike) Items.LEAD);
|
|
|
|
+ this.forceDrops = false; // Paper
|
|
|
|
this.leashInfoTag = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java b/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
|
2021-11-25 00:46:26 +01:00
|
|
|
index e47f3092b6bd6b86b577de705db1a575d0952348..490212cfe4e5cea7219eaf4304e14bfac0e6472d 100644
|
2021-07-22 04:58:24 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
|
|
|
|
@@ -100,7 +100,9 @@ public class WorkAtComposter extends WorkAtPoi {
|
|
|
|
ItemStack itemstack = inventorysubcontainer.addItem(new ItemStack(Items.BREAD, j));
|
|
|
|
|
|
|
|
if (!itemstack.isEmpty()) {
|
|
|
|
+ entity.forceDrops = true; // Paper
|
|
|
|
entity.spawnAtLocation(itemstack, 0.5F);
|
|
|
|
+ entity.forceDrops = false; // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
2021-11-25 00:46:26 +01:00
|
|
|
index 29372c8a0c54e4bae518e09846f0e9caba263896..f9be50049325a1139d67ccf590caeeceadb2fd23 100644
|
2021-07-22 04:58:24 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
2021-11-25 00:46:26 +01:00
|
|
|
@@ -522,7 +522,9 @@ public class Panda extends Animal {
|
2021-07-22 04:58:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!this.level.isClientSide() && this.random.nextInt(700) == 0 && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
|
|
|
|
+ this.forceDrops = true; // Paper
|
|
|
|
this.spawnAtLocation((ItemLike) Items.SLIME_BALL);
|
|
|
|
+ this.forceDrops = false; // Paper
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
|
2021-11-25 00:46:26 +01:00
|
|
|
index f7c23377e41870c558a49a08552d109b7b9cbc33..8a2c2b4bd603aae37055abd058feb7ee759078ce 100644
|
2021-07-22 04:58:24 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
|
2021-11-25 00:46:26 +01:00
|
|
|
@@ -305,7 +305,9 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
|
2021-07-22 04:58:24 +02:00
|
|
|
@Override
|
|
|
|
protected void finishConversion(ServerLevel world) {
|
|
|
|
PiglinAi.cancelAdmiring(this);
|
|
|
|
+ this.forceDrops = true; // Paper
|
|
|
|
this.inventory.removeAllItems().forEach(this::spawnAtLocation);
|
|
|
|
+ this.forceDrops = false; // Paper
|
|
|
|
super.finishConversion(world);
|
|
|
|
}
|
|
|
|
|