3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-30 18:10:06 +01:00
Paper/nms-patches/BehaviorCareer.patch

40 Zeilen
2.1 KiB
Diff

--- a/net/minecraft/server/BehaviorCareer.java
+++ b/net/minecraft/server/BehaviorCareer.java
2020-06-25 02:00:00 +02:00
@@ -2,6 +2,11 @@
import com.google.common.collect.ImmutableMap;
2020-06-25 02:00:00 +02:00
import java.util.Optional;
+// CraftBukkit start
+import org.bukkit.craftbukkit.entity.CraftVillager;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.VillagerCareerChangeEvent;
+// CraftBukkit end
public class BehaviorCareer extends Behavior<EntityVillager> {
2020-06-25 02:00:00 +02:00
@@ -19,7 +24,7 @@
GlobalPos globalpos = (GlobalPos) entityvillager.getBehaviorController().getMemory(MemoryModuleType.POTENTIAL_JOB_SITE).get();
entityvillager.getBehaviorController().removeMemory(MemoryModuleType.POTENTIAL_JOB_SITE);
- entityvillager.getBehaviorController().setMemory(MemoryModuleType.JOB_SITE, (Object) globalpos);
+ entityvillager.getBehaviorController().setMemory(MemoryModuleType.JOB_SITE, globalpos); // CraftBukkit - decompile error
2020-08-11 23:00:00 +02:00
worldserver.broadcastEntityEffect(entityvillager, (byte) 14);
2020-06-25 02:00:00 +02:00
if (entityvillager.getVillagerData().getProfession() == VillagerProfession.NONE) {
MinecraftServer minecraftserver = worldserver.getMinecraftServer();
2020-08-11 23:00:00 +02:00
@@ -31,7 +36,14 @@
2020-06-25 02:00:00 +02:00
return villagerprofession.b() == villageplacetype;
}).findFirst();
}).ifPresent((villagerprofession) -> {
- entityvillager.setVillagerData(entityvillager.getVillagerData().withProfession(villagerprofession));
+ // CraftBukkit start - Fire VillagerCareerChangeEvent where Villager gets employed
+ VillagerCareerChangeEvent event = CraftEventFactory.callVillagerCareerChangeEvent(entityvillager, CraftVillager.nmsToBukkitProfession(villagerprofession), VillagerCareerChangeEvent.ChangeReason.EMPLOYED);
+ if (event.isCancelled()) {
+ return;
+ }
+
+ entityvillager.setVillagerData(entityvillager.getVillagerData().withProfession(CraftVillager.bukkitToNmsProfession(event.getProfession())));
+ // CraftBukkit end
2020-08-11 23:00:00 +02:00
entityvillager.c(worldserver);
});
2020-06-25 02:00:00 +02:00
}