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

Merge pull request 'Update Schematic Download and /webpw to new Website' (#3) from Schematics/new-website into main

Browse Source 
Reviewed-on: SteamWar/SteamWar#3
This commit is contained in:
Lixfel
2025-01-20 12:26:54 +01:00
parent 3d2cba6a28 721723716e
commit d721a7496e
6 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class PunishmentCommand {
return null;
}
return SteamwarUser.getOrCreate(uuid, name, u -> {}, (o, n) -> {});
return SteamwarUser.getOrCreate(uuid, name, u -> {});
}
private static UUID getUUIDofOfflinePlayer(String playerName) {
VelocityCore/src/de/steamwar/velocitycore/commands/WebpasswordCommand.java
+5 -30
View File
@@ -21,10 +21,7 @@ package de.steamwar.velocitycore.commands;
import de.steamwar.command.SWCommand;
import de.steamwar.messages.Chatter;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import de.steamwar.sql.SteamwarUser;
public class WebpasswordCommand extends SWCommand {
@@ -40,33 +37,11 @@ public class WebpasswordCommand extends SWCommand {
return;
}
ProcessBuilder pb = new ProcessBuilder("php", "/var/www/register.php", sender.user().getUserName(), password);
pb.redirectErrorStream(true);
try {
Process regProcess = pb.start();
BufferedReader reader = new BufferedReader(new InputStreamReader(regProcess.getInputStream()));
String errorLine;
if((errorLine = reader.readLine()) != null) {
if ("updated".equals(errorLine)) {
sender.system("WEB_UPDATED");
return;
} else {
throw new SecurityException("Could not create webaccount " + errorLine);
}
}
SteamwarUser user = sender.user();
boolean resetPW = user.hasPassword();
sender.system("WEB_CREATED");
} catch (IOException e) {
throw new SecurityException("Could not create webaccount", e);
}
}
user.setPassword(password);
public static void changeUsername(String oldUsername, String newUsername){
ProcessBuilder pb = new ProcessBuilder("php", "/var/www/changename.php", oldUsername, newUsername);
try {
pb.start();
} catch (IOException e) {
throw new SecurityException("Could not change username", e);
}
sender.system(resetPW ? "WEB_UPDATED" : "WEB_CREATED");
}
}
VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
+2 -1
View File
@@ -39,6 +39,7 @@ import net.kyori.adventure.text.event.ClickEvent;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import java.util.function.BiConsumer;
public class ConnectionListener extends BasicListener {
@@ -56,7 +57,7 @@ public class ConnectionListener extends BasicListener {
if(!(subject instanceof Player player))
return perm -> Tristate.TRUE;
Set<UserPerm> perms = SteamwarUser.getOrCreate(player.getUniqueId(), player.getUsername(), ConnectionListener::newPlayer, WebpasswordCommand::changeUsername).perms();
Set<UserPerm> perms = SteamwarUser.getOrCreate(player.getUniqueId(), player.getUsername(), ConnectionListener::newPlayer).perms();
if(perms.contains(UserPerm.ADMINISTRATION))
return perm -> Tristate.TRUE;
else if(perms.contains(UserPerm.TEAM))