mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-27 14:12:45 +02:00
c0936a71bd
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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
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 8c8176121cafed0ed09239b6a7b392dc846438e2..3bc24457d143449e6a338d79becf7c39b9f81054 100644
|
|
--- a/src/main/java/org/bukkit/entity/Villager.java
|
|
+++ b/src/main/java/org/bukkit/entity/Villager.java
|
|
@@ -60,8 +60,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);
|
|
|
|
@@ -81,6 +84,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.
|