mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 05:55:44 +01:00
dd11ef8441
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: 3a3bea52 SPIGOT-7829: Increase maximum outgoing plugin message size to match Vanilla intention 5cd1c8cb SPIGOT-7831: Add CreatureSpawnEvent.SpawnReason#POTION_EFFECT a8e278f0 SPIGOT-7827: Sync EntityPortalEvent with PlayerPortalEvent since non-players can now create portals 53729d12 Remove spurious ApiStatus.Internal annotation b9f57486 SPIGOT-7799, PR-1039: Expose explosion world interaction in EntityExplodeEvent and BlockExplodeEvent 7983b966 PR-1029: Trial changing a small number of inner enums to classes/interfaces to better support custom values CraftBukkit Changes: 403accd56 SPIGOT-7831: Add CreatureSpawnEvent.SpawnReason#POTION_EFFECT 812761660 Increase outdated build delay bed1e3ff6 SPIGOT-7827: Sync EntityPortalEvent with PlayerPortalEvent since non-players can now create portals 2444c8b23 SPIGOT-7823: Suspicious sand and gravel material are not marked as having gravity correctly aceddcd0b SPIGOT-7820: Enum changes - duplicate method name a0d2d6a84 SPIGOT-7813: Material#isInteractable() always returns false 8fd64b091 SPIGOT-7806: Handle both loot and inventory item drop behaviour in PlayerDeathEvent a4ee40b74 SPIGOT-7799, PR-1436: Expose explosion world interaction in EntityExplodeEvent and BlockExplodeEvent 082aa51c5 PR-1424: Trial changing a small number of inner enums to classes/interfaces to better support custom values 66e78a96b SPIGOT-7815: Consider EntityDamageEvent status for Wolf armor damage Spigot Changes: 5bbef5ad SPIGOT-7834: Modify max value for generic.max_absorption
58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
|
|
Date: Sun, 16 Oct 2022 15:58:38 +0200
|
|
Subject: [PATCH] More vanilla friendly methods to update trades
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
|
|
index 0759f66986cec2c7e3f765aaa5b1654b5ed9f4b5..444744ea6f5921b0ae229995f8b15ea9d980c402 100644
|
|
--- a/src/main/java/org/bukkit/entity/Villager.java
|
|
+++ b/src/main/java/org/bukkit/entity/Villager.java
|
|
@@ -64,8 +64,11 @@ public interface Villager extends AbstractVillager {
|
|
* A villager with a level of 1 and no experience is liable to lose its
|
|
* profession.
|
|
*
|
|
+ * This doesn't update the trades of this villager.
|
|
+ *
|
|
* @param level the new level
|
|
* @throws IllegalArgumentException if level not between [1, 5]
|
|
+ * @see #increaseLevel(int)
|
|
*/
|
|
public void setVillagerLevel(int level);
|
|
|
|
@@ -85,6 +88,34 @@ public interface Villager extends AbstractVillager {
|
|
public void setVillagerExperience(int experience);
|
|
|
|
// Paper start
|
|
+ /**
|
|
+ * Increases the level of this villager.
|
|
+ * The villager will also unlock new recipes unlike the raw
|
|
+ * method {@link #setVillagerLevel(int)}.
|
|
+ * <p>
|
|
+ * A villager with a level of 1 and no experience is liable to lose its
|
|
+ * profession.
|
|
+ * <p>
|
|
+ * A master villager has a level of 5 in its profession and
|
|
+ * will unlock 10 trades (2 per level).
|
|
+ *
|
|
+ * @param amount The amount of level
|
|
+ * @return Whether trades are unlocked
|
|
+ * @throws IllegalArgumentException if current level plus the amount
|
|
+ * isn't between [1, 5] or the amount isn't positive
|
|
+ * @see #setVillagerLevel(int)
|
|
+ */
|
|
+ boolean increaseLevel(int amount);
|
|
+
|
|
+ /**
|
|
+ * Gives to this villager some potential new trades
|
|
+ * based to its profession and level.
|
|
+ * @param amount The amount of trades to give
|
|
+ * @return Whether trades are added
|
|
+ * @throws IllegalArgumentException if the amount isn't positive
|
|
+ */
|
|
+ boolean addTrades(int amount);
|
|
+
|
|
/**
|
|
* Gets the amount of times a villager has restocked their trades today
|
|
* @return The amount of trade restocks.
|