mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-01 01:04:57 +02:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
23 lines
841 B
Diff
23 lines
841 B
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:28 -0500
|
|
Subject: [PATCH] Villager#resetOffers
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/AbstractVillager.java b/src/main/java/org/bukkit/entity/AbstractVillager.java
|
|
index d2b0c08554dba4d34b37b440f1d77ae0e64cb99e..7fbe31c4fd69d4fca7ef96c0a56b0e0204d60cf4 100644
|
|
--- a/src/main/java/org/bukkit/entity/AbstractVillager.java
|
|
+++ b/src/main/java/org/bukkit/entity/AbstractVillager.java
|
|
@@ -21,4 +21,11 @@ public interface AbstractVillager extends Breedable, NPC, InventoryHolder, Merch
|
|
@NotNull
|
|
@Override
|
|
Inventory getInventory();
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Reset this villager's trade offers
|
|
+ */
|
|
+ public void resetOffers();
|
|
+ // Paper end
|
|
}
|