Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix dupe bug caused by SPIGOT-6452

Browse Source
This commit is contained in:
BillyGalbreath
2021-05-28 06:56:59 -05:00
parent 2618c24f7e
commit 96460068cd
1 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
patches/server/0222-Fix-dupe-bug-caused-by-SPIGOT-6452.patch Normal file
View File

@@ -0,0 +1,42 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Fri, 28 May 2021 06:48:48 -0500
Subject: [PATCH] Fix dupe bug caused by SPIGOT-6452
diff --git a/src/main/java/net/minecraft/world/InventorySubcontainer.java b/src/main/java/net/minecraft/world/InventorySubcontainer.java
index 760e61167a053b9df73823600561ddb0cf3ff2c7..69d4f223bf142371c9a999bc54f6e22b7252aa00 100644
--- a/src/main/java/net/minecraft/world/InventorySubcontainer.java
+++ b/src/main/java/net/minecraft/world/InventorySubcontainer.java
@@ -34,6 +34,16 @@ public class InventorySubcontainer implements IInventory, AutoRecipeOutput {
return this.items;
}
+ // Purpur start
+ public void setContents(List<ItemStack> items) {
+ this.items.clear();
+ for(int i = 0; i < items.size(); i++) {
+ this.items.set(i, items.get(i));
+ }
+ this.update();
+ }
+ // Purpur end
+
public void onOpen(CraftHumanEntity who) {
transaction.add(who);
}
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index 4903d79ad1036df8f52aded6ddaca604d4a8434a..6e7b5b2ededdee6dce555d1e65f9b7418ff9fce0 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -913,8 +913,10 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
}
// CraftBukkit start
+ List<ItemStack> contentsSnapshot = new java.util.ArrayList<>(inventorysubcontainer.getContents()); // Purpur
ItemStack itemstack1 = inventorysubcontainer.a(itemstack);
if (CraftEventFactory.callEntityPickupItemEvent(this, entityitem, itemstack1.getCount(), false).isCancelled()) {
+ inventorysubcontainer.setContents(contentsSnapshot); // Purpur
return;
}
// CraftBukkit end