1 files changed, 20 insertions, 0 deletions
diff --git a/patch-remap/og/net/minecraft/server/commands/CommandSpreadPlayers.patch b/patch-remap/og/net/minecraft/server/commands/CommandSpreadPlayers.patch
new file mode 100644
index 0000000000..b637188cd4
--- /dev/null
+++ b/patch-remap/og/net/minecraft/server/commands/CommandSpreadPlayers.patch
@@ -0,0 +1,20 @@
+--- a/net/minecraft/server/commands/CommandSpreadPlayers.java
++++ b/net/minecraft/server/commands/CommandSpreadPlayers.java
+@@ -93,7 +93,7 @@
+             if (entity instanceof EntityHuman) {
+                 set.add(entity.getTeam());
+             } else {
+-                set.add((Object) null);
++                set.add((ScoreboardTeamBase) null); // CraftBukkit - decompile error
+             }
+         }
+ 
+@@ -203,7 +203,7 @@
+                 commandspreadplayers_a = acommandspreadplayers_a[j++];
+             }
+ 
+-            entity.teleportTo(worldserver, (double) MathHelper.floor(commandspreadplayers_a.x) + 0.5D, (double) commandspreadplayers_a.getSpawnY(worldserver, i), (double) MathHelper.floor(commandspreadplayers_a.z) + 0.5D, Set.of(), entity.getYRot(), entity.getXRot());
++            entity.teleportTo(worldserver, (double) MathHelper.floor(commandspreadplayers_a.x) + 0.5D, (double) commandspreadplayers_a.getSpawnY(worldserver, i), (double) MathHelper.floor(commandspreadplayers_a.z) + 0.5D, Set.of(), entity.getYRot(), entity.getXRot(), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.COMMAND); // CraftBukkit - handle teleport reason
+             d1 = Double.MAX_VALUE;
+             CommandSpreadPlayers.a[] acommandspreadplayers_a1 = acommandspreadplayers_a;
+             int k = acommandspreadplayers_a.length;