mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Mon, 7 Oct 2019 00:15:37 -0500
|
|
Subject: [PATCH] Villager#resetOffers
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
|
|
index 78f7f1602b34e9d2162446810b0ee1357fd4922c..0a62cf36a95d7bf1287acdd17464fc677c7a4b7d 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
|
|
@@ -115,6 +115,13 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
|
|
return this.tradingPlayer != null;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ public void resetOffers() {
|
|
+ this.offers = new MerchantOffers();
|
|
+ this.updateTrades();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public MerchantOffers getOffers() {
|
|
if (this.offers == null) {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
|
|
index 1467232779541a9e38420caabf273662f380794c..762354681315e4c74e414bf7d677b5422385161e 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
|
|
@@ -70,4 +70,11 @@ public class CraftAbstractVillager extends CraftAgeable implements AbstractVilla
|
|
public HumanEntity getTrader() {
|
|
return this.getMerchant().getTrader();
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public void resetOffers() {
|
|
+ getHandle().resetOffers();
|
|
+ }
|
|
+ // Paper end
|
|
}
|