aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0409-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0409-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch')
-rw-r--r--patches/server/0409-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0409-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0409-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
new file mode 100644
index 0000000000..94dbb79f58
--- /dev/null
+++ b/patches/server/0409-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: kickash32 <[email protected]>
+Date: Sat, 9 May 2020 02:01:48 -0400
+Subject: [PATCH] Ensure EntityRaider respects game and entity rules for
+ picking up items
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
+index 6babc2ccd99b739a03145e9ac6f676a46f06c773..4bb9730b6a42702e91467f980b9f045585039db3 100644
+--- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
++++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
+@@ -312,6 +312,7 @@ public abstract class Raider extends PatrollingMonster {
+
+ @Override
+ public boolean canUse() {
++ if (!this.mob.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) || !this.mob.canPickUpLoot()) return false; // Paper - respect game and entity rules for picking up items
+ Raid raid = this.mob.getCurrentRaid();
+
+ if (this.mob.hasActiveRaid() && !this.mob.getCurrentRaid().isOver() && this.mob.canBeLeader() && !ItemStack.matches(this.mob.getItemBySlot(EquipmentSlot.HEAD), Raid.getLeaderBannerInstance())) {