Upstream/Advanced-Portals
1
0
Fork 0
mirror of https://github.com/sekwah41/Advanced-Portals.git synced 2024-11-16 23:55:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into spigot

Browse Source
This commit is contained in:
sekwah41 2018-02-02 10:41:12 +00:00
commit 83ab90db36
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/sekwah/advancedportals/core/api/managers/PortalManager.java
View File

@ -70,7 +70,7 @@ public class PortalManager {
if (this.portalHashMap == null) {
this.portalHashMap = new HashMap<>();
}
this.portalsCore.getDataStorage().storeJson(this.portalHashMap, "config.json");
this.portalsCore.getDataStorage().storeJson(this.portalHashMap, "portals.json");
this.updatePortalArray();
}

6
src/com/sekwah/advancedportals/core/api/portal/AdvancedPortal.java
View File

@ -1,5 +1,6 @@
package com.sekwah.advancedportals.core.api.portal;
import com.google.gson.annotations.SerializedName;
import com.sekwah.advancedportals.core.AdvancedPortalsCore;
import com.sekwah.advancedportals.core.api.registry.TagRegistry;
import com.sekwah.advancedportals.core.api.warphandler.ActivationData;
@ -16,13 +17,18 @@ import java.util.Set;
* @author sekwah41
*/
public class AdvancedPortal {
@SerializedName("max")
private PortalLocation maxLoc;
@SerializedName("min")
private PortalLocation minLoc;
@SerializedName("t")
private String triggerBlock;
@SerializedName("a")
private HashMap<String, String> args = new HashMap<>();
private transient Set<String> argsCol;
public AdvancedPortal(PortalLocation maxLoc, PortalLocation minLoc) {

6
src/com/sekwah/advancedportals/core/data/PortalLocation.java
View File

@ -1,10 +1,16 @@
package com.sekwah.advancedportals.core.data;
import com.google.gson.annotations.SerializedName;
public class PortalLocation {
@SerializedName("x")
public final int posX;
@SerializedName("y")
public final int posY;
@SerializedName("z")
public final int posZ;
@SerializedName("w")
public final String worldName;
public PortalLocation(String worldName, int posX, int posY, int posZ) {