Downgrade to 1.20.6

Includes bad omen trigger fix (Bukkit bug)

Author: ThisTestUser

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 group = "com.solarrabbit"
 version = "1.11.7"
 description = "LargeRaids"
-val mcVersion = "1.21.1"
+val mcVersion = "1.20.6"
 
 java {
   // Configure the java toolchain. This allows gradle to auto-provision JDK 21 on systems that only have JDK 8 installed for example.

src/main/java/com/solarrabbit/largeraids/LargeRaids.java

@@ -55,7 +55,7 @@ public final class LargeRaids extends JavaPlugin {
     private TriggerManager triggerManager;
     private VillageManager villageManager;
 
-    private static final String VERSION = "1.21.1";
+    private static final String VERSION = "1.20.6";
 
     @Override
     public void onEnable() {

src/main/java/com/solarrabbit/largeraids/trigger/omen/KillCaptainListener.java

@@ -0,0 +1,62 @@
+package com.solarrabbit.largeraids.trigger.omen;
+
+import com.solarrabbit.largeraids.LargeRaids;
+import com.solarrabbit.largeraids.trigger.Trigger;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.entity.EntityPotionEffectEvent;
+import org.bukkit.event.entity.EntityPotionEffectEvent.Cause;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+public class KillCaptainListener extends Trigger {
+    private static final int DEFAULT_EFFECT_DURATION = 100 * 60 * 20;
+    private int prevAmplifier;
+
+    public KillCaptainListener(LargeRaids plugin) {
+        super(plugin);
+        prevAmplifier = -1;
+    }
+
+    /**
+     * Handles event where server intends to apply/increase players' omen levels on
+     * patrol captain kills.
+     *
+     * @param evt event described above
+     */
+    @EventHandler
+    public void onOmenIncrease(EntityPotionEffectEvent evt) {
+        PotionEffectType type = evt.getModifiedType();
+        if (type == null || !type.equals(PotionEffectType.BAD_OMEN))
+            return;
+        PotionEffect effect = evt.getOldEffect();
+        switch (evt.getAction()) {
+            case REMOVED:
+                if (evt.getCause() != Cause.UNKNOWN)
+                    return;
+                prevAmplifier = effect == null ? -1 : effect.getAmplifier();
+                break;
+            case ADDED:
+                if (evt.getCause() != Cause.PATROL_CAPTAIN) // Could be added by commands or the plugin itself
+                    return;
+                if (evt.getNewEffect().getAmplifier() == 0) // Ignore newly applied effect
+                    return;
+                evt.setCancelled(true);
+                Player killer = (Player) evt.getEntity();
+                int maxAllowed = plugin.getTriggerConfig().getOmenConfig().getMaxLevel();
+                killer.addPotionEffect(
+                        new PotionEffect(PotionEffectType.BAD_OMEN, DEFAULT_EFFECT_DURATION,
+                                Math.min(maxAllowed - 1, prevAmplifier + 1)));
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public void unregisterListener() {
+        EntityPotionEffectEvent.getHandlerList().unregister(this);
+    }
+
+}

src/main/java/com/solarrabbit/largeraids/trigger/omen/VillageAbsorbOmenListener.java

@@ -7,6 +7,7 @@
 import com.solarrabbit.largeraids.raid.LargeRaid;
 import com.solarrabbit.largeraids.trigger.Trigger;
 
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.EntityPotionEffectEvent;
@@ -17,8 +18,12 @@
 import org.bukkit.potion.PotionEffectType;
 
 public class VillageAbsorbOmenListener extends Trigger {
+    private final KillCaptainListener killCaptainListener;
+
     public VillageAbsorbOmenListener(LargeRaids plugin) {
         super(plugin);
+        killCaptainListener = new KillCaptainListener(plugin);
+        Bukkit.getPluginManager().registerEvents(killCaptainListener, plugin);
     }
 
     /**
@@ -32,15 +37,19 @@ public void onVanillaRaidCreation(RaidTriggerEvent evt) {
             return;
         evt.setCancelled(true);
         Player player = evt.getPlayer();
-        int amplifier = player.getPotionEffect(PotionEffectType.RAID_OMEN).getAmplifier();
+        int amplifier = player.getPotionEffect(PotionEffectType.BAD_OMEN).getAmplifier();
         triggerRaid(player, player.getLocation(), amplifier + 1);
+
+        // Bukkit is supposed to remove this effect after the event is cancelled,
+        // but it removes RAID_OMEN only, which is probably a bug.
+        player.removePotionEffect(PotionEffectType.BAD_OMEN);
     }
 
     @EventHandler
     public void onEffectRemoval(EntityPotionEffectEvent evt) {
         PotionEffectType type = evt.getModifiedType();
-        if (type == null || !type.equals(PotionEffectType.RAID_OMEN) || evt.getAction() != Action.REMOVED
-                || evt.getCause() != Cause.EXPIRATION)
+        if (type == null || !type.equals(PotionEffectType.BAD_OMEN) || evt.getAction() != Action.REMOVED
+                || evt.getCause() != Cause.UNKNOWN)
             return;
         Set<LargeRaid> affectedLargeRaids = plugin.getRaidManager().currentRaids.stream()
                 .filter(LargeRaid::releaseOmen).collect(Collectors.toSet());
@@ -56,6 +65,7 @@ public void onEffectRemoval(EntityPotionEffectEvent evt) {
     public void unregisterListener() {
         RaidTriggerEvent.getHandlerList().unregister(this);
         EntityPotionEffectEvent.getHandlerList().unregister(this);
+        killCaptainListener.unregisterListener();
     }
 
     private class MultipleLargeRaidReleaseOmenException extends RuntimeException {

src/main/java/com/solarrabbit/largeraids/versioned/nms/RaiderPathfindToTargetGoal.java

@@ -74,7 +74,7 @@ public void tick() {
                 this.changed = false;
             }
             if (!this.mob.isPathFinding()) {
-                Vec3 posTowards = targetPos != null ? targetPos.getBottomCenter()
+                Vec3 posTowards = targetPos != null ? Vec3.atBottomCenterOf(targetPos)
                         : DefaultRandomPos.getPosTowards(this.mob, 15, 4, Vec3.atBottomCenterOf(
                         currentRaid.getCenter()), (float) (Math.PI / 2));
                 if (posTowards != null) {