Merge branch 'master' into 1.17

src/main/java/carpet/CarpetSettings.java

@@ -536,6 +536,14 @@ public class CarpetSettings
     )
     public static int maxEntityCollisions = 0;
 
+    @Rule(
+            desc = "Customizable server list ping (Multiplayer menu) playerlist sample limit",
+            options = {"0", "12", "20", "40"},
+            category = CREATIVE,
+            strict = false,
+            validate = Validator.NONNEGATIVE_NUMBER.class
+    )
+    public static int pingPlayerListLimit = 12;
     /*
 
     @Rule(

src/main/java/carpet/commands/PlayerCommand.java

@@ -23,6 +23,7 @@ import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
@@ -271,7 +272,13 @@ public class PlayerCommand
             Messenger.m(context.getSource(), "rb Player name: "+playerName+" is too long");
             return 0;
         }
+
         MinecraftServer server = source.getMinecraftServer();
+        if (!World.isInBuildLimit(new BlockPos(pos.x, pos.y, pos.z)))
+        {
+            Messenger.m(context.getSource(), "rb Player "+playerName+" cannot be placed outside of the world");
+            return 0;
+        }
         PlayerEntity player = EntityPlayerMPFake.createFake(playerName, server, pos.x, pos.y, pos.z, facing.y, facing.x, dimType, mode);
         if (player == null)
         {

src/main/java/carpet/helpers/OptimizedExplosion.java

@@ -107,20 +107,22 @@ public class OptimizedExplosion
 
         explosionSound++;
 
+        Entity explodingEntity = eAccess.getEntity();
         for (int k2 = 0; k2 < entitylist.size(); ++k2) {
             Entity entity = entitylist.get(k2);
 
-            if (entity == eAccess.getEntity()) {
+
+            if (entity == explodingEntity) {
                 // entitylist.remove(k2);
                 removeFast(entitylist, k2);
                 k2--;
                 continue;
             }
 
-            if (entity instanceof TntEntity &&
-                    entity.getX() == eAccess.getEntity().getX() &&
-                    entity.getY() == eAccess.getEntity().getY() &&
-                    entity.getZ() == eAccess.getEntity().getZ()) {
+            if (entity instanceof TntEntity && explodingEntity != null &&
+                    entity.getX() == explodingEntity.getX() &&
+                    entity.getY() == explodingEntity.getY() &&
+                    entity.getZ() == explodingEntity.getZ()) {
                 if (eLogger != null) {
                     eLogger.onEntityImpacted(entity, new Vec3d(0,-0.9923437498509884d, 0));
                 }

src/main/java/carpet/mixins/MinecraftServer_pingPlayerSampleLimit.java

@@ -0,0 +1,19 @@
+package carpet.mixins;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+import carpet.CarpetSettings;
+import net.minecraft.server.MinecraftServer;
+
+@Mixin(MinecraftServer.class)
+public abstract class MinecraftServer_pingPlayerSampleLimit
+{
+
+	@ModifyConstant(method = "tick", constant = @Constant(intValue = 12), require = 0, allow = 1)
+	private int modifyPlayerSampleLimit(int value)
+	{
+		return CarpetSettings.pingPlayerListLimit;
+	}
+}

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

@@ -431,7 +431,7 @@ public class EntityValue extends Value
         put("motion_z", (e, a) -> new NumericValue(e.getVelocity().z));
         put("on_ground", (e, a) -> new NumericValue(e.isOnGround()));
         put("name", (e, a) -> new StringValue(e.getName().getString()));
-        put("display_name", (e, a) -> new StringValue(e.getDisplayName().getString()));
+        put("display_name", (e, a) -> new FormattedTextValue(e.getDisplayName()));
         put("command_name", (e, a) -> new StringValue(e.getEntityName()));
         put("custom_name", (e, a) -> e.hasCustomName()?new StringValue(e.getCustomName().getString()):Value.NULL);
         put("type", (e, a) -> new StringValue(nameFromRegistryId(Registry.ENTITY_TYPE.getId(e.getType()))));

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

@@ -341,7 +341,7 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf
         int from = normalizeIndex(fromDesc, size);
         if (toDesc == null)
             return new ListValue((Collection<? extends Value>) getItems().subList(from, size));
-        int to = normalizeIndex(toDesc, size);
+        int to = normalizeIndex(toDesc, size+1);
         if (from > to)
             return ListValue.of();
         return new ListValue((Collection<? extends Value>) getItems().subList(from, to));

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

@@ -186,7 +186,7 @@ public abstract class Value implements Comparable<Value>, Cloneable
         int size = value.length();
         int from = ListValue.normalizeIndex(fromDesc, size);
         if (toDesc == null) return new StringValue(value.substring(from));
-        int to = ListValue.normalizeIndex(toDesc, size);
+        int to = ListValue.normalizeIndex(toDesc, size+1);
         if (from > to) return StringValue.EMPTY;
         return new StringValue(value.substring(from, to));
     }