apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash on exiting personal pocket dimension #185

Closed
notabadminer wants to merge 67 commits from master into master
pull from: master
merge into: apex:master
Conversation 1 Commits 67 Files Changed 366 +7 -5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e8b682c23 - Show all commits

1
src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
View File

@@ -122,6 +122,7 @@ public class EventHookContainer
if (!PocketManager.isLoaded()) if (!PocketManager.isLoaded())
{ {
PocketManager.load(); PocketManager.load();
PocketManager.isConnected = true;
} }
} }

11
src/main/java/StevenDimDoors/mod_pocketDim/core/PocketManager.java
View File

@@ -63,7 +63,7 @@ public class PocketManager
{ {
Point4D source = link.point; Point4D source = link.point;
NewDimData dimension = getDimensionData(source.getDimension()); NewDimData dimension = getDimensionData(source.getDimension());
if (dimension.getLink(source.getX(), source.getY(), source.getZ()) == null) if (dimension != null && dimension.getLink(source.getX(), source.getY(), source.getZ()) == null)
dimension.createLink(source, LinkType.CLIENT, 0, link.lock); dimension.createLink(source, LinkType.CLIENT, 0, link.lock);
} }
@@ -72,7 +72,7 @@ public class PocketManager
{ {
Point4D source = link.point; Point4D source = link.point;
NewDimData dimension = getDimensionData(source.getDimension()); NewDimData dimension = getDimensionData(source.getDimension());
if (dimension.getLink(source.getX(),source.getY(),source.getZ()) != null) if (dimension != null && dimension.getLink(source.getX(),source.getY(),source.getZ()) != null)
dimension.deleteLink(source.getX(), source.getY(), source.getZ()); dimension.deleteLink(source.getX(), source.getY(), source.getZ());
} }
@@ -81,9 +81,10 @@ public class PocketManager
{ {
Point4D source = link.point; Point4D source = link.point;
NewDimData dimension = getDimensionData(source.getDimension()); NewDimData dimension = getDimensionData(source.getDimension());
DimLink dLink = dimension.getLink(source); if (dimension != null) {
dLink.lock = link.lock; DimLink dLink = dimension.getLink(source);
dLink.lock = link.lock;
}
} }
} }