forked from SteamWar/SteamWar
Format code
This commit is contained in:
@@ -52,8 +52,7 @@ public class CommandPortal implements PortalHandler {
|
||||
int maxId = 0;
|
||||
for (int i = 1; i < parts.length; i++) {
|
||||
stackIds[i - 1] = Integer.parseInt(parts[i].substring(0, 1));
|
||||
if (stackIds[i - 1] > maxId)
|
||||
maxId = stackIds[i - 1];
|
||||
if (stackIds[i - 1] > maxId) maxId = stackIds[i - 1];
|
||||
}
|
||||
|
||||
Iterator<Portal> stack = Portals.getStack(player).iterator();
|
||||
@@ -82,8 +81,9 @@ public class CommandPortal implements PortalHandler {
|
||||
cmd.append(pieces[i]).append(parts[i + 1].substring(1));
|
||||
}
|
||||
|
||||
if (ModifyCommand.modifying(player))
|
||||
if (ModifyCommand.modifying(player)) {
|
||||
player.sendMessage("/" + cmd);
|
||||
}
|
||||
NetworkSender.send(new ExecuteCommandPacket(SteamwarUser.get(player.getUniqueId()).getId(), cmd.toString()));
|
||||
}
|
||||
|
||||
|
||||
@@ -40,8 +40,7 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
|
||||
public static FightserverPortal findFree(String gamemode) {
|
||||
List<FightserverPortal> list = portals.getOrDefault(gamemode, Collections.emptyList());
|
||||
for (FightserverPortal portal : list) {
|
||||
if (portal.server == null)
|
||||
return portal;
|
||||
if (portal.server == null) return portal;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -107,10 +106,11 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
|
||||
|
||||
FightInfoPacket info = server.current();
|
||||
|
||||
if (fightStateCountdown(info.getFightState()))
|
||||
if (fightStateCountdown(info.getFightState())) {
|
||||
hologram.updateText(String.format("§7%s §e%s §7%d§8:§7%02d", server.getServerName(), fightStateMapper(info.getFightState()), info.getCountdown() / 60, info.getCountdown() % 60));
|
||||
else
|
||||
} else {
|
||||
hologram.updateText(String.format("§7%s §e%s", server.getServerName(), fightStateMapper(info.getFightState())));
|
||||
}
|
||||
}
|
||||
|
||||
public void updateBluePlayers() {
|
||||
@@ -137,8 +137,7 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
|
||||
});
|
||||
|
||||
for (SteamwarUser user : remainingPlayers) {
|
||||
if (remainingLocations.isEmpty())
|
||||
break;
|
||||
if (remainingLocations.isEmpty()) break;
|
||||
|
||||
npcs.add(new NPC(remainingLocations.remove(0), user.getUUID(), user.getUserName()));
|
||||
}
|
||||
|
||||
@@ -263,8 +263,7 @@ public class Portal implements PortalHandler, ConfigurationSerializable {
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (!(obj instanceof ChunkCoords))
|
||||
return false;
|
||||
if (!(obj instanceof ChunkCoords)) return false;
|
||||
|
||||
ChunkCoords coords = (ChunkCoords) obj;
|
||||
return x == coords.x && z == coords.z;
|
||||
|
||||
@@ -74,8 +74,9 @@ public class TeleportPortal implements PortalHandler {
|
||||
player.sendMessage("§cAus unbekannten Gründen führt dieses Portal zurzeit in den Limbus");
|
||||
return;
|
||||
}
|
||||
if (ModifyCommand.modifying(player))
|
||||
if (ModifyCommand.modifying(player)) {
|
||||
player.sendMessage("teleport " + portal.getId() + " -> " + target.getId());
|
||||
}
|
||||
|
||||
Vector normalized = portal.normalize(to);
|
||||
if (target.getDepth() != 0.0) {
|
||||
|
||||
Reference in New Issue
Block a user