SteamWar/BauSystem
Archiviert
13
0

WorldEditShortcuts #115

Manuell gemergt
YoyoNow hat 3 Commits von WorldEditShortcuts nach master 2020-11-17 09:40:03 +01:00 zusammengeführt
Nur Änderungen aus Commit 670be6d968 werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -19,7 +19,6 @@
package de.steamwar.bausystem;
import com.sk89q.worldedit.command.WorldEditCommands;
import de.steamwar.bausystem.commands.*;
import de.steamwar.bausystem.commands.worldedit.*;
import de.steamwar.bausystem.tracer.ShowManager;
@ -68,14 +67,14 @@ public class BauSystem extends JavaPlugin implements Listener {
plugin = this;
String worldName = Bukkit.getWorlds().get(0).getName();
try{
try {
owner = UUID.fromString(worldName);
sections = ArenaSection.loadFromFile(new File(Bukkit.getWorldContainer().getPath() + '/' + getOwner().toString() + "/sections.yml"));
}catch(IllegalArgumentException e){
try{
} catch (IllegalArgumentException e) {
try {
owner = null;
sections = ArenaSection.loadFromFile(new File(Bukkit.getWorldContainer().getPath() + '/' + worldName + "/sections.yml"));
}catch(IOException | InvalidConfigurationException ex){
} catch (IOException | InvalidConfigurationException ex) {
getLogger().log(Level.SEVERE, "owner is no UUID / failed to load sections.yml", e);
Bukkit.shutdown();
return;
@ -141,25 +140,28 @@ public class BauSystem extends JavaPlugin implements Listener {
autoShutdown = Bukkit.getScheduler().runTaskLater(this, Bukkit::shutdown, 1200);
}
public static BauSystem getPlugin(){
public static BauSystem getPlugin() {
return plugin;
}
public static UUID getOwner(){
public static UUID getOwner() {
//Lazy loading to improve startup time of the server in 1.15
if(owner == null){
try{
if (owner == null) {
try {
owner = SteamwarUser.get(Integer.parseInt(Bukkit.getWorlds().get(0).getName())).getUUID();
}catch(NumberFormatException e){
} catch (NumberFormatException e) {
Bukkit.shutdown();
throw new SecurityException("owner is not a UserID", e);
}
}
return owner;
}
public static List<ArenaSection> getSections(){
public static List<ArenaSection> getSections() {
return sections;
}
public static int getOwnerID(){
public static int getOwnerID() {
return SteamwarUser.get(getOwner()).getId();
}
@ -170,7 +172,7 @@ public class BauSystem extends JavaPlugin implements Listener {
@EventHandler
public void onJoin(PlayerLoginEvent e) {
if(autoShutdown != null){
if (autoShutdown != null) {
autoShutdown.cancel();
autoShutdown = null;
}