Added BecomeVehicle trigger

Xemorr · Sep 25, 2021 · e204bd2 · e204bd2
1 parent b3a2fb0
commit e204bd2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.xemor</groupId>
     <artifactId>skillslibrary</artifactId>
-    <version>2.4.3</version>
+    <version>2.4.4</version>
     <packaging>jar</packaging>
 
     <name>SkillsLibrary</name>

diff --git a/src/main/java/me/xemor/skillslibrary2/triggers/Trigger.java b/src/main/java/me/xemor/skillslibrary2/triggers/Trigger.java
@@ -29,6 +29,7 @@ public class Trigger {
         registerTrigger("TARGET", TriggerData.class);
         registerTrigger("VEHICLE", TriggerData.class);
         registerTrigger("ENTERVEHICLE", TriggerData.class);
+        registerTrigger("BECOMEVEHICLE", TriggerData.class);
         registerTrigger("EXITVEHICLE", TriggerData.class);
         registerTrigger("PLAYERJOIN", TriggerData.class);
         registerTrigger("PLAYERQUIT", TriggerData.class);

diff --git a/src/main/java/me/xemor/skillslibrary2/triggers/Triggers.java b/src/main/java/me/xemor/skillslibrary2/triggers/Triggers.java
@@ -201,6 +201,7 @@ public void onVehicleEnter(VehicleEnterEvent e) {
         if (e.getEntered() instanceof LivingEntity) {
             boolean cancel = handleSkills(Trigger.getTrigger("ENTERVEHICLE"), e.getEntered(), e.getVehicle());
             cancel |= handleSkills(Trigger.getTrigger("VEHICLE"), e.getEntered(), e.getVehicle());
+            cancel |= handleSkills(Trigger.getTrigger("BECOMEVEHICLE"), e.getVehicle(), e.getEntered());
             e.setCancelled(cancel);
         }
     }
@@ -253,10 +254,7 @@ public boolean handleSkills(int trigger, @Nullable Entity entity, Object... obje
         Collection<Skill> skills = SkillsLibrary.getSkillsManager().getSkills(trigger);
         boolean cancel = false;
         for (Skill skill : skills) {
-            boolean cancelled = skill.handleEffects(entity, objects);
-            if (cancelled) {
-                cancel = true;
-            }
+            cancel |= skill.handleEffects(entity, objects);
         }
         return cancel;
     }