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 11:06:37 +00:00
commit 7c560bbf87
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DragAndDropStarter.bat
View File

@ -1,7 +1,7 @@
REM Use this file for testing cases for different versions, just drag the version you want to test the plugin in and it will start.
@ECHO OFF
:A
java -Xmx4096M -jar %1
java -Xmx4096M -DIReallyKnowWhatIAmDoingISwear=true -jar %1
REM Could add a 32 bit test part but noone uses 32 bit anymore
GOTO A
PAUSE.

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

@ -64,7 +64,7 @@ public class PortalManager {
* Load the default data into the portals.
*/
public void loadPortals() {
Type type = new TypeToken<Map<String, AdvancedPortal>>() {
Type type = new TypeToken<HashMap<String, AdvancedPortal>>() {
}.getType();
this.portalHashMap = this.portalsCore.getDataStorage().loadJson(type, "portals.json");
if (this.portalHashMap == null) {