43 lines
3.1 KiB
Diff
43 lines
3.1 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/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||
|
|
index 4aa34320ef7d6c62ccb17734bfa61d406190b919..a83a7d37f3d769535161fda46fca6f71dcc4d515 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||
|
|
@@ -112,7 +112,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||
|
|
private long lastGossipDecayTime;
|
||
|
|
private int villagerXp;
|
||
|
|
private long lastRestockGameTime;
|
||
|
|
- private int numberOfRestocksToday;
|
||
|
|
+ private int numberOfRestocksToday; public int getRestocksToday(){ return this.numberOfRestocksToday; } public void setRestocksToday(int restocksToday){ this.numberOfRestocksToday = restocksToday; } // Paper OBFHELPER
|
||
|
|
private long lastRestockCheckDayTime;
|
||
|
|
private boolean assignProfessionWhenSpawned;
|
||
|
|
private static final ImmutableList<MemoryModuleType<?>> MEMORY_TYPES = ImmutableList.of(MemoryModuleType.HOME, MemoryModuleType.JOB_SITE, MemoryModuleType.POTENTIAL_JOB_SITE, MemoryModuleType.MEETING_POINT, MemoryModuleType.MOBS, MemoryModuleType.VISIBLE_MOBS, MemoryModuleType.VISIBLE_VILLAGER_BABIES, MemoryModuleType.NEAREST_PLAYERS, MemoryModuleType.NEAREST_VISIBLE_PLAYER, MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER, MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, MemoryModuleType.WALK_TARGET, new MemoryModuleType[]{MemoryModuleType.LOOK_TARGET, MemoryModuleType.INTERACTION_TARGET, MemoryModuleType.BREED_TARGET, MemoryModuleType.PATH, MemoryModuleType.DOORS_TO_CLOSE, MemoryModuleType.NEAREST_BED, MemoryModuleType.HURT_BY, MemoryModuleType.HURT_BY_ENTITY, MemoryModuleType.NEAREST_HOSTILE, MemoryModuleType.SECONDARY_JOB_SITE, MemoryModuleType.HIDING_PLACE, MemoryModuleType.HEARD_BELL_TIME, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.LAST_SLEPT, MemoryModuleType.LAST_WOKEN, MemoryModuleType.LAST_WORKED_AT_POI, MemoryModuleType.GOLEM_DETECTED_RECENTLY});
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
|
||
|
|
index 5a21e9447c3e0225b07144eec83c277dd101bfd5..d0b933cfd02b237bfe85011831dab6e8e966496e 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
|
||
|
|
@@ -83,6 +83,18 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
|
||
|
|
getHandle().setVillagerXp(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");
|