EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 27 Wiki Activity

Don't force nethergate.gate to exist

Browse Source
This commit is contained in:
PseudoKnight
2018-05-26 14:23:46 -07:00
parent f8e95eacbe
commit 57684b2645
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/TheDgtl/Stargate/Portal.java
View File

@@ -1317,7 +1317,7 @@ public class Portal {
int modZ = Integer.parseInt(split[4]); int modZ = Integer.parseInt(split[4]);
float rotX = Float.parseFloat(split[5]); float rotX = Float.parseFloat(split[5]);
Blox topLeft = new Blox(world, split[6]); 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) { if (gate == null) {
Stargate.log.info("[Stargate] Gate layout on line " + l + " does not exist [" + split[7] + "]"); Stargate.log.info("[Stargate] Gate layout on line " + l + " does not exist [" + split[7] + "]");
continue; continue;

4
src/net/TheDgtl/Stargate/Stargate.java
View File

@@ -221,10 +221,6 @@ public class Stargate extends JavaPlugin {
} }
Gate.loadGates(gateFolder); 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"); log.info("[Stargate] Loaded " + Gate.getGateCount() + " gate layouts");
for (World world : getServer().getWorlds()) { for (World world : getServer().getWorlds()) {
Portal.loadAllGates(world); Portal.loadAllGates(world);