mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
--- a/net/minecraft/server/CommandSpreadPlayers.java
|
|
+++ b/net/minecraft/server/CommandSpreadPlayers.java
|
|
@@ -240,9 +240,16 @@
|
|
}
|
|
|
|
public List<String> tabComplete(MinecraftServer minecraftserver, ICommandListener icommandlistener, String[] astring, @Nullable BlockPosition blockposition) {
|
|
- return astring.length >= 1 && astring.length <= 2 ? b(astring, 0, blockposition) : Collections.emptyList();
|
|
+ return astring.length >= 1 && astring.length <= 2 ? b(astring, 0, blockposition) : Collections.<String>emptyList(); // CraftBukkit - decompile error
|
|
}
|
|
|
|
+ // CraftBukkit start - fix decompile error
|
|
+ @Override
|
|
+ public int compareTo(ICommand o) {
|
|
+ return a(o);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
static class Location2D {
|
|
|
|
double a;
|
|
@@ -309,7 +316,7 @@
|
|
}
|
|
|
|
blockposition = blockposition.down();
|
|
- } while (world.getType(blockposition).getMaterial() == Material.AIR);
|
|
+ } while (getType(world, blockposition).getMaterial() == Material.AIR); // CraftBukkit
|
|
|
|
return blockposition.getY() + 1;
|
|
}
|
|
@@ -325,7 +332,7 @@
|
|
}
|
|
|
|
blockposition = blockposition.down();
|
|
- material = world.getType(blockposition).getMaterial();
|
|
+ material = getType(world, blockposition).getMaterial(); // CraftBukkit
|
|
} while (material == Material.AIR);
|
|
|
|
return !material.isLiquid() && material != Material.FIRE;
|
|
@@ -335,5 +342,12 @@
|
|
this.a = MathHelper.a(random, d0, d2);
|
|
this.b = MathHelper.a(random, d1, d3);
|
|
}
|
|
+
|
|
+ // CraftBukkit start - add a version of getType which force loads chunks
|
|
+ private static IBlockData getType(World world, BlockPosition position) {
|
|
+ ((ChunkProviderServer) world.chunkProvider).getChunkAt(position.getX() >> 4, position.getZ() >> 4);
|
|
+ return world.getType(position);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|