25w20a

src/main/java/carpet/script/value/EntityValue.java

@@ -573,7 +573,7 @@ public class EntityValue extends Value
                 {
                     return Value.NULL;
                 }
-                return ValueConversions.fromPath((ServerLevel) e.getCommandSenderWorld(), path);
+                return ValueConversions.fromPath((ServerLevel) e.level(), path);
             }
             return Value.NULL;
         });
@@ -624,7 +624,7 @@ public class EntityValue extends Value
                 {
                     return StringValue.of(moddedType);
                 }
-                MinecraftServer server = p.getCommandSenderWorld().getServer();
+                MinecraftServer server = p.level().getServer();
                 if (server.isDedicatedServer())
                 {
                     return new StringValue("multiplayer");
@@ -829,7 +829,7 @@ public class EntityValue extends Value
                 case MISS:
                     return Value.NULL;
                 case BLOCK:
-                    return new BlockValue((ServerLevel) e.getCommandSenderWorld(), ((BlockHitResult) hitres).getBlockPos());
+                    return new BlockValue((ServerLevel) e.level(), ((BlockHitResult) hitres).getBlockPos());
                 case ENTITY:
                     return new EntityValue(((EntityHitResult) hitres).getEntity());
             }
@@ -927,7 +927,7 @@ public class EntityValue extends Value
             }
             else
             {
-                ((ServerLevel) e.getCommandSenderWorld()).getChunkSource().broadcastAndSend(e, ClientboundEntityPositionSyncPacket.of(e));
+                ((ServerLevel) e.level()).getChunkSource().broadcastAndSend(e, ClientboundEntityPositionSyncPacket.of(e));
             }
         }
     }
@@ -1376,7 +1376,7 @@ public class EntityValue extends Value
                 List<Value> params = lv.getItems();
                 Vector3Argument blockLocator = Vector3Argument.findIn(params, 0, false, false);
                 BlockPos pos = BlockPos.containing(blockLocator.vec);
-                ResourceKey<Level> world = spe.getCommandSenderWorld().dimension();
+                ResourceKey<Level> world = spe.level().dimension();
                 float angle = spe.getYHeadRot();
                 boolean forced = false;
                 if (params.size() > blockLocator.offset)