From 469a9356f61b4c2cf83e64d85a32618838d0efb2 Mon Sep 17 00:00:00 2001
From: altrisi <altrisi.trillosierra@gmail.com>
Date: Sat, 29 Nov 2025 19:30:54 +0100
Subject: [PATCH] Fix `player_takes_damage` and `player_deals_damage`: Use
 correct source

Fixes #2042, relates to #2121
---
 src/main/java/carpet/script/CarpetEventServer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java
index 677f412d..8ed822e2 100644
--- a/src/main/java/carpet/script/CarpetEventServer.java
+++ b/src/main/java/carpet/script/CarpetEventServer.java
@@ -886,7 +886,7 @@ public class CarpetEventServer
                                 new NumericValue(amount),
                                 StringValue.of(source.getMsgId()),
                                 source.getEntity() == null ? Value.NULL : new EntityValue(source.getEntity())
-                        ), () -> target.level().getServer().createCommandSourceStack());
+                        ), () -> ((ServerPlayer) target).createCommandSourceStack());
             }
         };
         public static final Event PLAYER_DEALS_DAMAGE = new Event("player_deals_damage", 3, false)
@@ -896,7 +896,7 @@ public class CarpetEventServer
             {
                 return handler.call(() ->
                                 Arrays.asList(new EntityValue(source.getEntity()), new NumericValue(amount), new EntityValue(target)),
-                        () -> source.getEntity().level().getServer().createCommandSourceStack()
+                        () -> ((ServerPlayer) source.getEntity()).createCommandSourceStack()
                 );
             }
         };