Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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; Logger logger = EntityVillager.LOGGER;
Objects.requireNonNull(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 @@ @@ -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; return EntityType.VILLAGER;
} }
@Override
public void remove() {
getHandle().releaseAllPois();
super.remove();
}
@Override @Override
public Profession getProfession() { public Profession getProfession() {
return CraftVillager.nmsToBukkitProfession(getHandle().getVillagerData().getProfession()); return CraftVillager.nmsToBukkitProfession(getHandle().getVillagerData().getProfession());