Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-09 09:01:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix EntityRaider picking up items when they shouldn't be able

Browse Source 
Fixes #2205
This commit is contained in:
Omer Uddin 2020-05-11 00:41:15 -04:00
parent 924d46ea01
commit d116dbd6dc
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Spigot-Server-Patches/Ensure-EntityRaider-respects-game-and-entity-rules-f.patch Normal file
View File

@ -0,0 +1,29 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
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/server/EntityRaider.java b/src/main/java/net/minecraft/server/EntityRaider.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityRaider.java
+++ b/src/main/java/net/minecraft/server/EntityRaider.java
@@ -0,0 +0,0 @@ public abstract class EntityRaider extends EntityMonsterPatrolling {
public class b<T extends EntityRaider> extends PathfinderGoal {
- private final T b;
+ private final T b; private T getRaider() { return b; } // Paper - obfhelper
public b(T entityraider) { // CraftBukkit - decompile error
this.b = entityraider;
@@ -0,0 +0,0 @@ public abstract class EntityRaider extends EntityMonsterPatrolling {
@Override
public boolean a() {
+ if (!getRaider().world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) || !getRaider().canPickupLoot()) return false; // Paper - respect game and entity rules for picking up items
+
Raid raid = this.b.eE();
if (this.b.eF() && !this.b.eE().a() && this.b.es() && !ItemStack.matches(this.b.getEquipment(EnumItemSlot.HEAD), Raid.s())) {