Skip to content

Commit 15b5b79

Browse files
author
BuildTools
committed
Urgent bug fix
1 parent 5891c8b commit 15b5b79

File tree

3 files changed

+4
-31
lines changed

3 files changed

+4
-31
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>me.loving11ish</groupId>
88
<artifactId>RedLightGreenLight</artifactId>
9-
<version>1.1</version>
9+
<version>1.2</version>
1010
<packaging>jar</packaging>
1111

1212
<name>RedLightGreenLight</name>

src/main/java/me/loving11ish/redlightgreenlight/events/PlayerMove.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import java.util.List;
1717
import java.util.UUID;
1818

19-
import static me.loving11ish.redlightgreenlight.utils.CountDownTasksUtils.taskID3;
2019
import static org.bukkit.Bukkit.getServer;
2120

2221
public class PlayerMove implements Listener {
@@ -33,24 +32,6 @@ public void onPlayerMove(PlayerMoveEvent event){
3332
if (GameManager.getGame1().contains(uuid)){
3433
if (GameManager.getPlayersInRound().contains(uuid)){
3534
if (!(GameManager.getLightgreen().equals(0))){
36-
if (!(GameManager.getGame1().size() == RedLightGreenLight.getPlugin().getConfig().getInt("Arena-start-size"))){
37-
Bukkit.getScheduler().cancelTask(taskID3);
38-
player.setGameMode(GameMode.SURVIVAL);
39-
player.sendTitle(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Game-loose-title")),
40-
ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Game-loose-subtitle")),
41-
10, 30, 10);
42-
getServer().dispatchCommand(Bukkit.getConsoleSender(), "execute at " + player.getName() + " run summon minecraft:lightning_bolt ~ ~ ~");
43-
if (RedLightGreenLight.getPlugin().getConfig().getBoolean("Run-lose-commands")){
44-
for (String string : losecommands) {
45-
getServer().dispatchCommand(Bukkit.getConsoleSender(), string.replace("%player%", target));
46-
}
47-
}
48-
GameManager.leaveRound(player);
49-
GameManager.leaveGame1(player);
50-
GameManager.teleportToLobby(player);
51-
PlayerInventoryHandler.clearInventory(player);
52-
PlayerInventoryHandler.restoreInventory(player);
53-
}
5435
player.setGameMode(GameMode.SURVIVAL);
5536
player.sendTitle(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Game-loose-title")),
5637
ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Game-loose-subtitle")),

src/main/java/me/loving11ish/redlightgreenlight/utils/CountDownTasksUtils.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,9 @@ public void run() {
183183
player.sendMessage(ColorUtils.translateColorCodes("&a&lGreen Light"));
184184
}
185185
}
186-
if (!(GameManager.getGame1().size() == RedLightGreenLight.getPlugin().getConfig().getInt("Arena-start-size"))){
187-
ArrayList<UUID> playersInGame = new ArrayList<>(GameManager.getGame1());
188-
for (int i = 0; i < playersInGame.size(); i++) {
189-
UUID uuid = playersInGame.get(i);
190-
Player player = (Player) Bukkit.getServer().getOfflinePlayer(uuid);
191-
getServer().dispatchCommand(Bukkit.getConsoleSender(), "execute at " + player.getName() + " run summon minecraft:lightning_bolt ~ ~ ~");
192-
player.sendTitle(ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Game-loose-title")),
193-
ColorUtils.translateColorCodes(RedLightGreenLight.getPlugin().getConfig().getString("Game-loose-subtitle")),
194-
10, 30, 10);
195-
}
196-
GameManager.endGameArena1();
186+
if (GameManager.getGame1().size() == 0 || GameManager.getPlayersInRound().size() == 0){
187+
GameManager.getPlayersInRound().clear();
188+
GameManager.getGame1().clear();
197189
Bukkit.getScheduler().cancelTask(taskID3);
198190
return;
199191
}

0 commit comments

Comments
 (0)