Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have

This commit is contained in:
TadahTech 2016-09-01 08:45:43 -05:00
commit 6f3d7dcd29

View File

@ -338,8 +338,7 @@ public class Basketball extends TeamGame
if (other.GetColor() == ChatColor.RED)
key = DataLoc.RED_SCORE_SPAWN.getKey();
i = Math.min(WorldData.GetCustomLocs(key).size() - 1, i);
player.teleport(WorldData.GetCustomLocs(key).get(i));
player.teleport(WorldData.GetCustomLocs(key).get(i % WorldData.GetCustomLocs(key).size()));
}
}
for (Player player : team.GetPlayers(true))