From 57684b264530ce6cf3394ab0fb37e02d2165b2b0 Mon Sep 17 00:00:00 2001 From: PseudoKnight Date: Sat, 26 May 2018 14:23:46 -0700 Subject: [PATCH] Don't force nethergate.gate to exist --- src/net/TheDgtl/Stargate/Portal.java | 2 +- src/net/TheDgtl/Stargate/Stargate.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/net/TheDgtl/Stargate/Portal.java b/src/net/TheDgtl/Stargate/Portal.java index 1695baa..86faeaf 100644 --- a/src/net/TheDgtl/Stargate/Portal.java +++ b/src/net/TheDgtl/Stargate/Portal.java @@ -1317,7 +1317,7 @@ public class Portal { int modZ = Integer.parseInt(split[4]); float rotX = Float.parseFloat(split[5]); Blox topLeft = new Blox(world, split[6]); - Gate gate = (split[7].contains(";")) ? Gate.getGateByName("nethergate.gate") : Gate.getGateByName(split[7]); + Gate gate = Gate.getGateByName(split[7]); if (gate == null) { Stargate.log.info("[Stargate] Gate layout on line " + l + " does not exist [" + split[7] + "]"); continue; diff --git a/src/net/TheDgtl/Stargate/Stargate.java b/src/net/TheDgtl/Stargate/Stargate.java index ef117b5..546b676 100644 --- a/src/net/TheDgtl/Stargate/Stargate.java +++ b/src/net/TheDgtl/Stargate/Stargate.java @@ -221,10 +221,6 @@ public class Stargate extends JavaPlugin { } Gate.loadGates(gateFolder); - // Replace nethergate.gate if it doesn't have an exit point. - if (Gate.getGateByName("nethergate.gate") == null || Gate.getGateByName("nethergate.gate").getExit() == null) { - Gate.populateDefaults(gateFolder); - } log.info("[Stargate] Loaded " + Gate.getGateCount() + " gate layouts"); for (World world : getServer().getWorlds()) { Portal.loadAllGates(world);