Brandon
/
FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#298

This commit is contained in:
Jesse Boyd 2016-09-19 13:49:52 +10:00
parent 87e03f835c
commit 326dcab1f1
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
forge110/src/main/java/com/boydti/fawe/forge/FaweForge.java
View File

@ -12,6 +12,7 @@ import com.boydti.fawe.util.MainUtil;
import com.boydti.fawe.util.TaskManager; import com.boydti.fawe.util.TaskManager;
import com.boydti.fawe.wrappers.WorldWrapper; import com.boydti.fawe.wrappers.WorldWrapper;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.forge.ForgeWorld; import com.sk89q.worldedit.forge.ForgeWorld;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import java.io.File; import java.io.File;
@ -105,7 +106,10 @@ public class FaweForge implements IFawe {
if (world instanceof WorldWrapper) { if (world instanceof WorldWrapper) {
world = ((WorldWrapper) world).getParent(); world = ((WorldWrapper) world).getParent();
} }
return getWorldName((world).getWorld()); else if (world instanceof EditSession) {
world = ((EditSession) world).getWorld();
}
return getWorldName(((ForgeWorld) world).getWorld());
} }

5
forge1710/src/main/java/com/boydti/fawe/forge/FaweForge.java
View File

@ -11,6 +11,7 @@ import com.boydti.fawe.regions.FaweMaskManager;
import com.boydti.fawe.util.MainUtil; import com.boydti.fawe.util.MainUtil;
import com.boydti.fawe.util.TaskManager; import com.boydti.fawe.util.TaskManager;
import com.boydti.fawe.wrappers.WorldWrapper; import com.boydti.fawe.wrappers.WorldWrapper;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.forge.ForgeWorld; import com.sk89q.worldedit.forge.ForgeWorld;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
@ -102,8 +103,10 @@ public class FaweForge implements IFawe {
if (world instanceof WorldWrapper) { if (world instanceof WorldWrapper) {
world = ((WorldWrapper) world).getParent(); world = ((WorldWrapper) world).getParent();
} }
else if (world instanceof EditSession) {
world = ((EditSession) world).getWorld();
}
return getWorldName(((ForgeWorld) world).getWorld()); return getWorldName(((ForgeWorld) world).getWorld());
} }
public String getWorldName(net.minecraft.world.World w) { public String getWorldName(net.minecraft.world.World w) {

5
forge189/src/main/java/com/boydti/fawe/forge/FaweForge.java
View File

@ -12,6 +12,7 @@ import com.boydti.fawe.util.MainUtil;
import com.boydti.fawe.util.TaskManager; import com.boydti.fawe.util.TaskManager;
import com.boydti.fawe.wrappers.WorldWrapper; import com.boydti.fawe.wrappers.WorldWrapper;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.forge.ForgeWorld; import com.sk89q.worldedit.forge.ForgeWorld;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import java.io.File; import java.io.File;
@ -105,8 +106,10 @@ public class FaweForge implements IFawe {
if (world instanceof WorldWrapper) { if (world instanceof WorldWrapper) {
world = ((WorldWrapper) world).getParent(); world = ((WorldWrapper) world).getParent();
} }
else if (world instanceof EditSession) {
world = ((EditSession) world).getWorld();
}
return getWorldName(((ForgeWorld) world).getWorld()); return getWorldName(((ForgeWorld) world).getWorld());
} }
public String getWorldName(net.minecraft.world.World w) { public String getWorldName(net.minecraft.world.World w) {

5
forge194/src/main/java/com/boydti/fawe/forge/FaweForge.java
View File

@ -12,6 +12,7 @@ import com.boydti.fawe.util.MainUtil;
import com.boydti.fawe.util.TaskManager; import com.boydti.fawe.util.TaskManager;
import com.boydti.fawe.wrappers.WorldWrapper; import com.boydti.fawe.wrappers.WorldWrapper;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.forge.ForgeWorld; import com.sk89q.worldedit.forge.ForgeWorld;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import java.io.File; import java.io.File;
@ -105,8 +106,10 @@ public class FaweForge implements IFawe {
if (world instanceof WorldWrapper) { if (world instanceof WorldWrapper) {
world = ((WorldWrapper) world).getParent(); world = ((WorldWrapper) world).getParent();
} }
else if (world instanceof EditSession) {
world = ((EditSession) world).getWorld();
}
return getWorldName(((ForgeWorld) world).getWorld()); return getWorldName(((ForgeWorld) world).getWorld());
} }
public String getWorldName(net.minecraft.world.World w) { public String getWorldName(net.minecraft.world.World w) {