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

make world identifier valid by hex encoding them

Browse Source
This commit is contained in:
Jakob Schulz
2026-11-01 00:46:13 +01:00
parent e22317f1fa
commit 1389f81c7c
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class FightSystem extends JavaPlugin {
String arenaMap = System.getProperty("arenaMap"); String arenaMap = System.getProperty("arenaMap");
if (arenaMap != null) { if (arenaMap != null) {
WorldIdentifier.set("arena/" + Core.getVersion() + "/" + arenaMap); WorldIdentifier.setArena(arenaMap);
} }
message = new Message("de.steamwar.fightsystem.FightSystem", FightSystem.class.getClassLoader()); message = new Message("de.steamwar.fightsystem.FightSystem", FightSystem.class.getClassLoader());
MissileWars/src/de/steamwar/misslewars/MissileWars.java
+1 -2
View File
@@ -19,7 +19,6 @@
package de.steamwar.misslewars; package de.steamwar.misslewars;
import de.steamwar.core.Core;
import de.steamwar.core.WorldIdentifier; import de.steamwar.core.WorldIdentifier;
import de.steamwar.linkage.AbstractLinker; import de.steamwar.linkage.AbstractLinker;
import de.steamwar.linkage.SpigotLinker; import de.steamwar.linkage.SpigotLinker;
@@ -60,7 +59,7 @@ public class MissileWars extends JavaPlugin {
String arenaMap = System.getProperty("arenaMap"); String arenaMap = System.getProperty("arenaMap");
if (arenaMap != null) { if (arenaMap != null) {
WorldIdentifier.set("arena/" + Core.getVersion() + "/" + arenaMap); WorldIdentifier.setArena(arenaMap);
} }
SpigotLinker spigotLinker = new SpigotLinker(this, null) { SpigotLinker spigotLinker = new SpigotLinker(this, null) {
SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldIdentifier.java
+7
View File
@@ -27,6 +27,9 @@ import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import java.nio.charset.StandardCharsets;
import java.util.HexFormat;
@Linked @Linked
public class WorldIdentifier { public class WorldIdentifier {
@@ -36,6 +39,10 @@ public class WorldIdentifier {
resourceKey = new ResourceKey<>(new ResourceLocation("minecraft", "dimension"), new ResourceLocation("steamwar", name)); resourceKey = new ResourceKey<>(new ResourceLocation("minecraft", "dimension"), new ResourceLocation("steamwar", name));
} }
public static void setArena(String map) {
set("arena/" + Core.getVersion() + "/" + HexFormat.of().formatHex(map.getBytes(StandardCharsets.UTF_8)));
}
public WorldIdentifier() { public WorldIdentifier() {
TinyProtocol.instance.addFilter(ClientboundLoginPacket.class, (player, packet) -> { TinyProtocol.instance.addFilter(ClientboundLoginPacket.class, (player, packet) -> {
if (resourceKey == null) return packet; if (resourceKey == null) return packet;
TNTLeague/src/de/steamwar/tntleague/TNTLeague.kt
+1 -2
View File
@@ -19,7 +19,6 @@
package de.steamwar.tntleague package de.steamwar.tntleague
import de.steamwar.core.Core
import de.steamwar.core.WorldIdentifier import de.steamwar.core.WorldIdentifier
import de.steamwar.message.Message import de.steamwar.message.Message
import de.steamwar.tntleague.command.* import de.steamwar.tntleague.command.*
@@ -47,7 +46,7 @@ class TNTLeague : JavaPlugin() {
val arenaMap = System.getProperty("arenaMap") val arenaMap = System.getProperty("arenaMap")
if (arenaMap != null) { if (arenaMap != null) {
WorldIdentifier.set("arena/" + Core.getVersion() + "/" + arenaMap) WorldIdentifier.setArena(arenaMap)
} }
ReadyCommand.register() ReadyCommand.register()
TowerRun/src/de/steamwar/towerrun/TowerRun.java
+1 -2
View File
@@ -20,7 +20,6 @@
package de.steamwar.towerrun; package de.steamwar.towerrun;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import de.steamwar.core.Core;
import de.steamwar.core.WorldIdentifier; import de.steamwar.core.WorldIdentifier;
import de.steamwar.linkage.AbstractLinker; import de.steamwar.linkage.AbstractLinker;
import de.steamwar.linkage.LinkedInstance; import de.steamwar.linkage.LinkedInstance;
@@ -60,7 +59,7 @@ public class TowerRun extends JavaPlugin {
String arenaMap = System.getProperty("arenaMap"); String arenaMap = System.getProperty("arenaMap");
if (arenaMap != null) { if (arenaMap != null) {
WorldIdentifier.set("arena/" + Core.getVersion() + "/" + arenaMap); WorldIdentifier.setArena(arenaMap);
} }
SpigotLinker spigotLinker = new SpigotLinker(this, message) { SpigotLinker spigotLinker = new SpigotLinker(this, message) {