From ed5b84c2d856ca304a6d5182723d923b8cb6d170 Mon Sep 17 00:00:00 2001
From: iambibi_ <89582596+iambibi@users.noreply.github.com>
Date: Mon, 16 Mar 2026 18:55:46 +0100
Subject: [PATCH 1/3] fix damage to other player

---
 .../listeners/dream/PlayerDamageListener.java | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java b/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java
index ddc990ffe..7075a41d7 100644
--- a/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java
+++ b/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java
@@ -1,9 +1,18 @@
 package fr.openmc.core.features.dream.listeners.dream;
 
+import fr.openmc.core.features.city.City;
+import fr.openmc.core.features.city.CityManager;
+import fr.openmc.core.features.city.ProtectionsManager;
+import fr.openmc.core.features.city.sub.mascots.utils.MascotUtils;
 import fr.openmc.core.features.dream.DreamUtils;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 
 public class PlayerDamageListener implements Listener {
@@ -17,4 +26,15 @@ public void onFall(EntityDamageEvent event) {
             event.setCancelled(true);
         }
     }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+        Entity victim = event.getEntity();
+        Entity damager = event.getDamager();
+
+        if (victim instanceof Player victimPlayer && DreamUtils.isInDreamWorld(victimPlayer)
+                && damager instanceof Player damagerPlayer && DreamUtils.isInDreamWorld(damagerPlayer)) {
+            event.setCancelled(true);
+        }
+    }
 }

From 4d63663028ca40e2883d59b2e160ce12dd0134de Mon Sep 17 00:00:00 2001
From: iambibi_ <89582596+iambibi@users.noreply.github.com>
Date: Thu, 19 Mar 2026 21:07:46 +0100
Subject: [PATCH 2/3] review

---
 .../dream/listeners/dream/PlayerDamageListener.java      | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java b/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java
index 7075a41d7..107ea1c0f 100644
--- a/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java
+++ b/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java
@@ -1,16 +1,9 @@
 package fr.openmc.core.features.dream.listeners.dream;
 
-import fr.openmc.core.features.city.City;
-import fr.openmc.core.features.city.CityManager;
-import fr.openmc.core.features.city.ProtectionsManager;
-import fr.openmc.core.features.city.sub.mascots.utils.MascotUtils;
 import fr.openmc.core.features.dream.DreamUtils;
-import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
@@ -27,7 +20,7 @@ public void onFall(EntityDamageEvent event) {
         }
     }
 
-    @EventHandler(priority = EventPriority.MONITOR)
+    @EventHandler
     public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
         Entity victim = event.getEntity();
         Entity damager = event.getDamager();

From f40ff98fad61d8d12f909259411a792a365472b5 Mon Sep 17 00:00:00 2001
From: iambibi_ <89582596+iambibi@users.noreply.github.com>
Date: Fri, 20 Mar 2026 17:32:23 +0100
Subject: [PATCH 3/3] add ignoreCancelled

---
 .../features/dream/listeners/dream/PlayerDamageListener.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java b/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java
index 107ea1c0f..8308637e2 100644
--- a/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java
+++ b/src/main/java/fr/openmc/core/features/dream/listeners/dream/PlayerDamageListener.java
@@ -20,7 +20,7 @@ public void onFall(EntityDamageEvent event) {
         }
     }
 
-    @EventHandler
+    @EventHandler(ignoreCancelled = true)
     public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
         Entity victim = event.getEntity();
         Entity damager = event.getDamager();