1.15-pre5-2

src/main/java/carpet/commands/PerimeterInfoCommand.java

@@ -52,7 +52,7 @@ public class PerimeterInfoCommand
             nbttagcompound.putString("id", mobId);
             entityliving = (MobEntity) EntityType.loadEntityWithPassengers(nbttagcompound, source.getWorld(), (entity_1x) -> {
                 entity_1x.setPositionAndAngles(pos.getX(), pos.getY()+2, pos.getZ(), entity_1x.yaw, entity_1x.pitch);
-                return !source.getWorld().method_18768(entity_1x) ? null : entity_1x;
+                return !source.getWorld().tryLoadEntity(entity_1x) ? null : entity_1x;
             });
             if (entityliving == null)
             {

src/main/java/carpet/mixins/PortalForcer_portalSuffocationMixin.java

@@ -33,14 +33,14 @@ public class PortalForcer_portalSuffocationMixin
 
     @Redirect(method = "usePortal", at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/entity/Entity;method_24203(DDD)V"
+            target = "Lnet/minecraft/entity/Entity;positAfterTeleport(DDD)V"
     ))
     private void alternativeSetPositionAndAngles(Entity entity, double d, double e, double f)
     {
         if (CarpetSettings.portalSuffocationFix && CarpetSettings.fixedPosition != null)
-            entity.method_24203(CarpetSettings.fixedPosition.x, CarpetSettings.fixedPosition.y, CarpetSettings.fixedPosition.z);
+            entity.positAfterTeleport(CarpetSettings.fixedPosition.x, CarpetSettings.fixedPosition.y, CarpetSettings.fixedPosition.z);
         else
-            entity.method_24203(d, e, f);
+            entity.positAfterTeleport(d, e, f);
 
     }
 

src/main/java/carpet/script/CarpetExpression.java

@@ -1952,7 +1952,7 @@ public class CarpetExpression
                 ServerWorld serverWorld = cc.s.getWorld();
                 Entity entity_1 = EntityType.loadEntityWithPassengers(tag, serverWorld, (entity_1x) -> {
                     entity_1x.setPositionAndAngles(vec3d.x, vec3d.y, vec3d.z, entity_1x.yaw, entity_1x.pitch);
-                    return !serverWorld.method_18768(entity_1x) ? null : entity_1x;
+                    return !serverWorld.tryLoadEntity(entity_1x) ? null : entity_1x;
                 });
                 if (entity_1 == null) {
                     return LazyValue.NULL;