Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Format code

Browse Source
This commit is contained in:
YoyoNow
2026-05-16 23:08:09 +02:00
parent 81dd8045f2
commit d110df924e
562 changed files with 11025 additions and 10059 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java
+12 -12
View File
@@ -48,27 +48,27 @@ public class CommandPortal implements PortalHandler {
public void handle(Player player, Location loc) {
String[] parts = command.split("\\\\");
int[] stackIds = new int[parts.length-1];
int[] stackIds = new int[parts.length - 1];
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];
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];
}
Iterator<Portal> stack = Portals.getStack(player).iterator();
String[] pieces = new String[stackIds.length];
while (maxId > 0) {
if(!stack.hasNext()) {
if (!stack.hasNext()) {
LobbySystem.getInstance().getLogger().log(Level.WARNING, "Stackportal with missing elements: " + player.getName() + " /" + command);
player.sendMessage("§cEigentlich solltest du gerade gar nicht durch dieses Portal durchgehen können...");
return;
}
Portal portal = stack.next();
if(portal.type() == PortalType.STACK) {
for(int i = 0; i < stackIds.length; i++) {
if(stackIds[i] == maxId) {
if (portal.type() == PortalType.STACK) {
for (int i = 0; i < stackIds.length; i++) {
if (stackIds[i] == maxId) {
pieces[i] = ((StackPortal) portal.getHandler()).getText();
}
}
@@ -78,11 +78,11 @@ public class CommandPortal implements PortalHandler {
}
StringBuilder cmd = new StringBuilder(parts[0]);
for(int i = 0; i < pieces.length; i++) {
cmd.append(pieces[i]).append(parts[i+1].substring(1));
for (int i = 0; i < pieces.length; i++) {
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()));
}
LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java
+6 -6
View File
@@ -39,8 +39,8 @@ 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)
for (FightserverPortal portal : list) {
if (portal.server == null)
return portal;
}
return null;
@@ -100,7 +100,7 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
}
public void updateText() {
if(server == null) {
if (server == null) {
hologram.updateText("§7Neuen Kampf starten");
return;
}
@@ -126,7 +126,7 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
List<Location> remainingLocations = new ArrayList<>(locations);
npcs.removeIf(npc -> {
SteamwarUser user = SteamwarUser.get(npc.getUuid());
if(remainingPlayers.contains(user)) {
if (remainingPlayers.contains(user)) {
remainingPlayers.remove(user);
remainingLocations.remove(npc.getLocation());
return false;
@@ -136,8 +136,8 @@ public class FightserverPortal implements PortalHandler, Comparable<FightserverP
}
});
for(SteamwarUser user : remainingPlayers) {
if(remainingLocations.isEmpty())
for (SteamwarUser user : remainingPlayers) {
if (remainingLocations.isEmpty())
break;
npcs.add(new NPC(remainingLocations.remove(0), user.getUUID(), user.getUserName()));
LobbySystem/src/de/steamwar/lobby/portal/Portal.java
+6 -6
View File
@@ -46,17 +46,17 @@ public class Portal implements PortalHandler, ConfigurationSerializable {
public static Portal getPortal(Location from, Location to) {
ChunkCoords in = new ChunkCoords(from);
ChunkCoords out = new ChunkCoords(to);
for(ChunkCoords coords : perChunk(Math.min(in.x, out.x), Math.max(in.x, out.x), Math.min(in.z, out.z), Math.max(in.z, out.z))) {
for(Portal portal : chunkPortals.getOrDefault(coords, Collections.emptyList())) {
for (ChunkCoords coords : perChunk(Math.min(in.x, out.x), Math.max(in.x, out.x), Math.min(in.z, out.z), Math.max(in.z, out.z))) {
for (Portal portal : chunkPortals.getOrDefault(coords, Collections.emptyList())) {
Vector normalizedFrom = portal.normalize(from);
Vector normalizedTo = portal.normalize(to);
if(portal.depth == 0.0) {
if (portal.depth == 0.0) {
normalizedFrom.setX(normalizedFrom.getX() > 0 ? 2 : -1);
normalizedTo.setX(normalizedTo.getX() > 0 ? 2 : -1);
}
if(inside(normalizedFrom.getX(), normalizedTo.getX()) && inside(normalizedFrom.getY(), normalizedTo.getY()) && inside(normalizedFrom.getZ(), normalizedTo.getZ())) {
if (inside(normalizedFrom.getX(), normalizedTo.getX()) && inside(normalizedFrom.getY(), normalizedTo.getY()) && inside(normalizedFrom.getZ(), normalizedTo.getZ())) {
return portal;
}
}
@@ -121,7 +121,7 @@ public class Portal implements PortalHandler, ConfigurationSerializable {
Vector orientation = pos2.toVector().subtract(pos1.toVector());
this.yRotation = Math.atan2(orientation.getX(), orientation.getZ());
this.pos1Vector = pos1.toVector().subtract(new Vector(depth/2, 0, 0).rotateAroundY(yRotation));
this.pos1Vector = pos1.toVector().subtract(new Vector(depth / 2, 0, 0).rotateAroundY(yRotation));
this.rotatedShape = new Vector(depth == 0.0 ? 1.0 : depth, orientation.getY(), orientation.clone().setY(0).length());
this.handler = handlerConstructor.apply(this);
@@ -263,7 +263,7 @@ public class Portal implements PortalHandler, ConfigurationSerializable {
@Override
public boolean equals(Object obj) {
if(!(obj instanceof ChunkCoords))
if (!(obj instanceof ChunkCoords))
return false;
ChunkCoords coords = (ChunkCoords) obj;
LobbySystem/src/de/steamwar/lobby/portal/TeleportPortal.java
+3 -3
View File
@@ -61,7 +61,7 @@ public class TeleportPortal implements PortalHandler {
@Override
public void handle(Player player, Location from, Location to) {
Deque<Portal> stack = Portals.getStack(player);
if(!stack.isEmpty() && sources.contains(stack.peek().getHandler())) {
if (!stack.isEmpty() && sources.contains(stack.peek().getHandler())) {
teleport(player, from, to, stack.pop());
} else {
teleport(player, from, to, Portal.getPortal(target));
@@ -69,12 +69,12 @@ public class TeleportPortal implements PortalHandler {
}
private void teleport(Player player, Location from, Location to, Portal target) {
if(target == null) {
if (target == null) {
LobbySystem.getInstance().getLogger().log(Level.WARNING, "Portal with unknown target: " + portal.getId());
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);