13
0

Remove guard statements

Dieser Commit ist enthalten in:
yoyosource 2022-08-30 16:57:29 +02:00
Ursprung 42c8336783
Commit 46d5a6aa5f
2 geänderte Dateien mit 29 neuen und 14 gelöschten Zeilen

Datei anzeigen

@ -27,6 +27,18 @@ plugins {
id 'com.github.johnrengelman.shadow' version '5.0.0' id 'com.github.johnrengelman.shadow' version '5.0.0'
} }
ext.swdep = { s ->
if (file("${rootDir}/lib/${s}.jar").exists()) {
return files("${rootDir}/lib/${s}.jar")
} else {
if (s.contains("-")) {
return "de.steamwar:${s.toLowerCase().replace('-', ':')}"
} else {
return "de.steamwar:${s.toLowerCase()}:RELEASE"
}
}
}
group 'de.steamwar' group 'de.steamwar'
version '' version ''
@ -71,12 +83,20 @@ sourceSets {
repositories { repositories {
mavenCentral() mavenCentral()
maven {
url = uri('https://steamwar.de/maven/')
credentials {
username = steamwarProperties.getProperty("maven.username")
password = steamwarProperties.getProperty("maven.password")
}
}
} }
dependencies { dependencies {
compileOnly files("${projectDir}/lib/Spigot-1.15.jar") compileOnly swdep("Spigot-1.15")
compileOnly files("${projectDir}/lib/WorldEdit-1.15.jar") compileOnly swdep("WorldEdit-1.15")
compileOnly files("${projectDir}/lib/SpigotCore.jar") compileOnly swdep("SpigotCore")
compileOnly 'org.projectlombok:lombok:1.18.22' compileOnly 'org.projectlombok:lombok:1.18.22'
testCompileOnly 'org.projectlombok:lombok:1.18.22' testCompileOnly 'org.projectlombok:lombok:1.18.22'

Datei anzeigen

@ -19,10 +19,9 @@
package de.steamwar.lobby.map; package de.steamwar.lobby.map;
import de.steamwar.command.GuardChecker;
import de.steamwar.command.GuardResult;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import de.steamwar.command.TypeMapper; import de.steamwar.command.TypeMapper;
import de.steamwar.command.TypeValidator;
import de.steamwar.sql.SteamwarUser; import de.steamwar.sql.SteamwarUser;
import de.steamwar.sql.UserGroup; import de.steamwar.sql.UserGroup;
import lombok.SneakyThrows; import lombok.SneakyThrows;
@ -41,7 +40,7 @@ public class CustomMapCommand extends SWCommand {
@Register @Register
@SneakyThrows @SneakyThrows
public void render(@Guard Player p, File file) { public void render(@Validator Player p, File file) {
if (SteamwarUser.get(p).getUserGroup() != UserGroup.Developer) { if (SteamwarUser.get(p).getUserGroup() != UserGroup.Developer) {
return; return;
} }
@ -52,14 +51,10 @@ public class CustomMapCommand extends SWCommand {
new CustomMap(p, ImageIO.read(file)); new CustomMap(p, ImageIO.read(file));
} }
@ClassGuard(value = Player.class, local = true) @ClassValidator(value = Player.class, local = true)
public GuardChecker getGuardChecker() { public TypeValidator<Player> getGuardChecker() {
return (commandSender, guardCheckType, strings, s) -> { return (commandSender, player, messageSender) -> {
Player player = (Player) commandSender; return SteamwarUser.get(player).getUserGroup() == UserGroup.Developer;
if (SteamwarUser.get(player).getUserGroup() == UserGroup.Developer) {
return GuardResult.ALLOWED;
}
return GuardResult.DENIED;
}; };
} }