spigot-mirror/craftbukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git synced 2025-09-18 21:54:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Release POIs when villagers are removed by plugins

Browse source
This commit is contained in:
md_5 2021-12-03 15:05:20 +11:00
parent 03b7252338
commit 6f3509d12e
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nms-patches/net/minecraft/world/entity/npc/EntityVillager.patch
View file

@ -58,6 +58,15 @@
Logger logger = EntityVillager.LOGGER;
Objects.requireNonNull(logger);
@@ -630,7 +645,7 @@
super.die(damagesource);
}
- private void releaseAllPois() {
+ public void releaseAllPois() {
this.releasePoi(MemoryModuleType.HOME);
this.releasePoi(MemoryModuleType.JOB_SITE);
this.releasePoi(MemoryModuleType.POTENTIAL_JOB_SITE);
@@ -816,7 +831,12 @@
}

7
src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
View file

@ -38,6 +38,13 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
return EntityType.VILLAGER;
}
@Override
public void remove() {
getHandle().releaseAllPois();
super.remove();
}
@Override
public Profession getProfession() {
return CraftVillager.nmsToBukkitProfession(getHandle().getVillagerData().getProfession());