CraftAttack/spawn
5
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

moved appliance queries to base method

Browse Source
This commit is contained in:
Elias Müller 2024-08-31 15:06:46 +02:00
parent 50e4192e32
commit 0959eb4aa5
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/mhsl/craftattack/spawn/appliance/Appliance.java
View File

@ -93,7 +93,7 @@ public abstract class Appliance {
listeners.forEach(HandlerList::unregisterAll); listeners.forEach(HandlerList::unregisterAll);
} }
public <T extends Appliance> T queryAppliance(Class<T> clazz) { protected static <T extends Appliance> T queryAppliance(Class<T> clazz) {
return Main.instance().getAppliance(clazz); return Main.instance().getAppliance(clazz);
} }

6
src/main/java/eu/mhsl/craftattack/spawn/appliances/outlawed/Outlawed.java
View File

@ -38,7 +38,7 @@ public class Outlawed extends Appliance {
if(!player.isOnline()) return; if(!player.isOnline()) return;
if(status != Status.FORCED) return; if(status != Status.FORCED) return;
try { try {
Main.instance().getAppliance(Whitelist.class).integrityCheck(player); queryAppliance(Whitelist.class).integrityCheck(player);
} catch(DisconnectInfo.Throwable e) { } catch(DisconnectInfo.Throwable e) {
Bukkit.getScheduler().runTask(Main.instance(), () -> e.getDisconnectScreen().applyKick(player)); Bukkit.getScheduler().runTask(Main.instance(), () -> e.getDisconnectScreen().applyKick(player));
} }
@ -75,7 +75,7 @@ public class Outlawed extends Appliance {
private void setLawStatus(Player player, Status status) { private void setLawStatus(Player player, Status status) {
playerStatusMap.put(player, status); playerStatusMap.put(player, status);
Main.instance().getAppliance(DisplayName.class).update(player); queryAppliance(DisplayName.class).update(player);
List<String> newList = localConfig().getStringList(voluntarilyEntry); List<String> newList = localConfig().getStringList(voluntarilyEntry);
if(status.equals(Status.VOLUNTARILY)) { if(status.equals(Status.VOLUNTARILY)) {
@ -93,7 +93,7 @@ public class Outlawed extends Appliance {
} }
private boolean isTimeout(Player player) { private boolean isTimeout(Player player) {
return timeouts.get(player.getUniqueId()) < System.currentTimeMillis() - timeoutInMs; return timeouts.getOrDefault(player.getUniqueId(), 0L) > System.currentTimeMillis() - timeoutInMs;
} }
private void setTimeout(Player player) { private void setTimeout(Player player) {

4
src/main/java/eu/mhsl/craftattack/spawn/appliances/settings/Settings.java
View File

@ -1,6 +1,5 @@
package eu.mhsl.craftattack.spawn.appliances.settings; package eu.mhsl.craftattack.spawn.appliances.settings;
import eu.mhsl.craftattack.spawn.Main;
import eu.mhsl.craftattack.spawn.appliance.Appliance; import eu.mhsl.craftattack.spawn.appliance.Appliance;
import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand; import eu.mhsl.craftattack.spawn.appliance.ApplianceCommand;
import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.Setting; import eu.mhsl.craftattack.spawn.appliances.settings.datatypes.Setting;
@ -37,7 +36,8 @@ public class Settings extends Appliance {
public static Settings instance() { public static Settings instance() {
if(settingsInstance != null) return settingsInstance; if(settingsInstance != null) return settingsInstance;
Settings instance = Main.instance().getAppliance(Settings.class); queryAppliance(Settings.class);
Settings instance = queryAppliance(Settings.class);
Settings.settingsInstance = instance; Settings.settingsInstance = instance;
return instance; return instance;
} }

2
src/main/java/eu/mhsl/craftattack/spawn/appliances/whitelist/Whitelist.java
View File

@ -64,7 +64,7 @@ public class Whitelist extends Appliance {
); );
} }
Main.instance().getAppliance(Outlawed.class).updateForcedStatus(player, timestampRelevant(user.outlawed_until)); queryAppliance(Outlawed.class).updateForcedStatus(player, timestampRelevant(user.outlawed_until));
String purePlayerName; String purePlayerName;
if(Floodgate.isBedrock(player)) { if(Floodgate.isBedrock(player)) {