twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-23 16:23:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

SPIGOT-4946: Add VillagerCareerChangeEvent

Browse Source 
By: i509VCB <null>
This commit is contained in:
CraftBukkit/Spigot
2019-05-25 20:58:11 -05:00
parent 3f2b383463
commit 5f2275f40a
4 changed files with 85 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
paper-server/nms-patches/BehaviorCareer.patch Normal file
View File

@@ -0,0 +1,30 @@
--- a/net/minecraft/server/BehaviorCareer.java
+++ b/net/minecraft/server/BehaviorCareer.java
@@ -1,6 +1,11 @@
package net.minecraft.server;
import com.google.common.collect.ImmutableMap;
+// 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> {
@@ -20,7 +25,14 @@
IRegistry.VILLAGER_PROFESSION.d().filter((villagerprofession) -> {
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
entityvillager.a(worldserver);
});
});