36f34f01c0
Upstream has released updates that appears 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: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes: 933e9094 #664: Add methods to get/set ItemStacks in EquipmentSlots 18722312 #662: Expose ItemStack and hand used in PlayerShearEntityEvent
48 lines
2 KiB
Diff
48 lines
2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: zbk <zbk@projectsolaris.net>
|
|
Date: Sun, 26 Apr 2020 23:49:01 -0400
|
|
Subject: [PATCH] Villager Restocks API
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
|
|
index 6e0020ae0b4d2f2597843129b83fff0d194de337..ef2ee68cd6774d4ed51e78c4cc4a4d46a1911bfc 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityVillager.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
|
|
@@ -977,4 +977,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
|
|
|
|
return optional.isPresent() && optional1.isPresent() ? i - ((MinecraftSerializableLong) optional.get()).a() < 24000L && i - ((MinecraftSerializableLong) optional1.get()).a() < 36000L : false;
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ public int getRestocksToday(){
|
|
+ return this.bL;
|
|
+ }
|
|
+ public void setRestocksToday(int restocksToday){
|
|
+ this.bL = restocksToday;
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
|
|
index fe726e7884c9f091d73c8f5d2cb58a87a16649f8..a8384081c03884c86578dca677914d77441c1863 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
|
|
@@ -82,6 +82,18 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
|
|
getHandle().setExperience(experience);
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public int getRestocksToday() {
|
|
+ return getHandle().getRestocksToday();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setRestocksToday(int restocksToday) {
|
|
+ getHandle().setRestocksToday(restocksToday);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public boolean sleep(Location location) {
|
|
Preconditions.checkArgument(location != null, "Location cannot be null");
|