zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Implement 1.16 bukkit config reloading exceptions

Browse source
This commit is contained in:
Frank van der Heijden 2020-07-19 21:28:24 +02:00
parent e27e9fb4ea
commit 926ceaf172
No known key found for this signature in database
GPG key ID: 26DA56488D314D11
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RDedicatedServer.java
View file

@ -8,6 +8,8 @@ import static net.frankheijden.serverutils.common.reflection.ReflectionUtils.get
import static net.frankheijden.serverutils.common.reflection.ReflectionUtils.getAllMethods; import static net.frankheijden.serverutils.common.reflection.ReflectionUtils.getAllMethods;
import static net.frankheijden.serverutils.common.reflection.ReflectionUtils.invoke; import static net.frankheijden.serverutils.common.reflection.ReflectionUtils.invoke;
import static net.frankheijden.serverutils.common.reflection.ReflectionUtils.set; import static net.frankheijden.serverutils.common.reflection.ReflectionUtils.set;
import static net.frankheijden.serverutils.common.reflection.VersionParam.between;
import static net.frankheijden.serverutils.common.reflection.VersionParam.max;
import static net.frankheijden.serverutils.common.reflection.VersionParam.min; import static net.frankheijden.serverutils.common.reflection.VersionParam.min;
import java.lang.reflect.Field; import java.lang.reflect.Field;
@ -32,9 +34,9 @@ public class RDedicatedServer {
fieldOf("propertyManager"), fieldOf("propertyManager"),
fieldOf("options"), fieldOf("options"),
fieldOf("autosavePeriod"), fieldOf("autosavePeriod"),
fieldOf("o", min(13))); fieldOf("o", between(13, 15)));
methods = getAllMethods(dedicatedServerClass, methods = getAllMethods(dedicatedServerClass,
methodOf("setSpawnAnimals", boolean.class), methodOf("setSpawnAnimals", max(15), boolean.class),
methodOf("getSpawnAnimals"), methodOf("getSpawnAnimals"),
methodOf("setPVP", boolean.class), methodOf("setPVP", boolean.class),
methodOf("getPVP"), methodOf("getPVP"),
@ -42,11 +44,14 @@ public class RDedicatedServer {
methodOf("getAllowFlight"), methodOf("getAllowFlight"),
methodOf("setMotd", String.class), methodOf("setMotd", String.class),
methodOf("getMotd"), methodOf("getMotd"),
methodOf("setSpawnNPCs", boolean.class), methodOf("setSpawnNPCs", max(15), boolean.class),
methodOf("setAllowFlight", boolean.class), methodOf("setAllowFlight", boolean.class),
methodOf("setResourcePack", String.class, String.class), methodOf("setResourcePack", String.class, String.class),
methodOf("setForceGamemode", boolean.class), methodOf("setForceGamemode", boolean.class),
methodOf("n", min(13), boolean.class)); methodOf("n", between(13, 15), boolean.class),
methodOf("aZ", max(15)),
methodOf("i", min(16), boolean.class),
methodOf("aY", min(16)));
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
} }
@ -68,16 +73,23 @@ public class RDedicatedServer {
Object propertyManager = RDedicatedServerSettings.newInstance(options); Object propertyManager = RDedicatedServerSettings.newInstance(options);
set(fields, console, "propertyManager", propertyManager); set(fields, console, "propertyManager", propertyManager);
Object config = invoke(RDedicatedServerSettings.getMethods(), propertyManager, "getProperties"); Object config = invoke(RDedicatedServerSettings.getMethods(), propertyManager, "getProperties");
invoke(methods, console, "setSpawnAnimals", getConfigValue(config, "spawnAnimals"));
invoke(methods, console, "setSpawnNPCs", getConfigValue(config, "spawnNpcs"));
invoke(methods, console, "setPVP", getConfigValue(config, "pvp")); invoke(methods, console, "setPVP", getConfigValue(config, "pvp"));
invoke(methods, console, "setAllowFlight", getConfigValue(config, "allowFlight")); invoke(methods, console, "setAllowFlight", getConfigValue(config, "allowFlight"));
invoke(methods, console, "setResourcePack", getConfigValue(config, "resourcePack"),
invoke(methods, console, "aZ"));
invoke(methods, console, "setMotd", getConfigValue(config, "motd")); invoke(methods, console, "setMotd", getConfigValue(config, "motd"));
invoke(methods, console, "setForceGamemode", getConfigValue(config, "forceGamemode")); invoke(methods, console, "setForceGamemode", getConfigValue(config, "forceGamemode"));
invoke(methods, console, "n", getConfigValue(config, "enforceWhitelist"));
set(fields, console, "o", getConfigValue(config, "gamemode")); if (MINOR <= 15) {
invoke(methods, console, "setSpawnAnimals", getConfigValue(config, "spawnAnimals"));
invoke(methods, console, "setSpawnNPCs", getConfigValue(config, "spawnNpcs"));
invoke(methods, console, "setResourcePack", getConfigValue(config, "resourcePack"),
invoke(methods, console, "aZ"));
invoke(methods, console, "n", getConfigValue(config, "enforceWhitelist"));
set(fields, console, "o", getConfigValue(config, "gamemode"));
} else {
invoke(methods, console, "setResourcePack", getConfigValue(config, "resourcePack"),
invoke(methods, console, "aY"));
invoke(methods, console, "i", getConfigValue(config, "enforceWhitelist"));
}
} else { } else {
Object config = RPropertyManager.newInstance(options); Object config = RPropertyManager.newInstance(options);
setConfigValue(config, console, "getSpawnAnimals", "setSpawnAnimals", "getBoolean", "spawn-animals"); setConfigValue(config, console, "getSpawnAnimals", "setSpawnAnimals", "getBoolean", "spawn-animals");