mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
Villager#resetOffers
This commit is contained in:
parent
f24af9bc9c
commit
691c4ee7b6
2 changed files with 23 additions and 2 deletions
|
@ -31,7 +31,21 @@
|
|||
|
||||
public AbstractVillager(EntityType<? extends AbstractVillager> type, Level world) {
|
||||
super(type, world);
|
||||
@@ -179,7 +192,7 @@
|
||||
@@ -101,6 +114,13 @@
|
||||
return this.tradingPlayer != null;
|
||||
}
|
||||
|
||||
+ // Paper start - Villager#resetOffers
|
||||
+ public void resetOffers() {
|
||||
+ this.offers = new MerchantOffers();
|
||||
+ this.updateTrades();
|
||||
+ }
|
||||
+ // Paper end - Villager#resetOffers
|
||||
+
|
||||
@Override
|
||||
public MerchantOffers getOffers() {
|
||||
if (this.level().isClientSide) {
|
||||
@@ -179,7 +199,7 @@
|
||||
public void readAdditionalSaveData(CompoundTag nbt) {
|
||||
super.readAdditionalSaveData(nbt);
|
||||
if (nbt.contains("Offers")) {
|
||||
|
@ -40,7 +54,7 @@
|
|||
Logger logger = AbstractVillager.LOGGER;
|
||||
|
||||
Objects.requireNonNull(logger);
|
||||
@@ -246,7 +259,16 @@
|
||||
@@ -246,7 +266,16 @@
|
||||
MerchantOffer merchantrecipe = ((VillagerTrades.ItemListing) arraylist.remove(this.random.nextInt(arraylist.size()))).getOffer(this, this.random);
|
||||
|
||||
if (merchantrecipe != null) {
|
||||
|
|
|
@ -34,4 +34,11 @@ public class CraftAbstractVillager extends CraftAgeable implements CraftMerchant
|
|||
public Inventory getInventory() {
|
||||
return new CraftInventory(this.getHandle().getInventory());
|
||||
}
|
||||
|
||||
// Paper start - Villager#resetOffers
|
||||
@Override
|
||||
public void resetOffers() {
|
||||
getHandle().resetOffers();
|
||||
}
|
||||
// Paper end - Villager#resetOffers
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue