Skip to content

Commit e0bdc2a

Browse files
Merge pull request Swofty-Developments#595 from petethepossum/master
Fixed formatting on "Team has won" title broadcast.
2 parents 0777204 + ab03cfe commit e0bdc2a

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

  • type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game
  • type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/events

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/game/Game.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ private void endGame(TeamKey winningTeam) {
501501
String subtitleMessage;
502502

503503
if (winningTeam != null) {
504-
titleMessage = winningTeam.chatColor() + "Team " + winningTeam.getName() + "has won!";
504+
titleMessage = winningTeam.chatColor() + "Team " + winningTeam.getName() + " has won!";
505505
subtitleMessage = "Congratulations!";
506506
} else {
507507
titleMessage = "§cGame Over!";

type.bedwarslobby/src/main/java/net/swofty/type/bedwarslobby/events/ActionPlayerSpawn.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
import net.swofty.type.generic.event.HypixelEvent;
88
import net.swofty.type.generic.event.HypixelEventClass;
99
import net.swofty.type.generic.user.HypixelPlayer;
10+
import net.minestom.server.entity.GameMode;
1011

1112
public class ActionPlayerSpawn implements HypixelEventClass {
1213

1314
@SneakyThrows
1415
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false, isAsync = true)
1516
public void run(PlayerSpawnEvent event) {
1617
final HypixelPlayer player = (HypixelPlayer) event.getPlayer();
18+
player.setGameMode(GameMode.SURVIVAL); //noticed stayed in Spectator after Bedwars game end. This is Hacky, but I don't see a reason why gamemode shouldn't be enforced on lobby join. -petethepossum
1719

1820
TypeBedWarsLobbyLoader.bedWarsLobbyMap.sendMapData(player);
1921
}

0 commit comments

Comments
 (0)