24w39a

src/main/java/carpet/script/CarpetEventServer.java

@@ -884,7 +884,7 @@ public class CarpetEventServer
                                 new NumericValue(amount),
                                 StringValue.of(source.getMsgId()),
                                 source.getEntity() == null ? Value.NULL : new EntityValue(source.getEntity())
-                        ), target::createCommandSourceStack);
+                        ), () -> target.getServer().createCommandSourceStack());
             }
         };
         public static final Event PLAYER_DEALS_DAMAGE = new Event("player_deals_damage", 3, false)
@@ -894,7 +894,7 @@ public class CarpetEventServer
             {
                 return handler.call(() ->
                                 Arrays.asList(new EntityValue(source.getEntity()), new NumericValue(amount), new EntityValue(target)),
-                        () -> source.getEntity().createCommandSourceStack()
+                        () -> source.getEntity().getServer().createCommandSourceStack()
                 );
             }
         };