mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix goto issues with objects

Browse Source
This commit is contained in:
Daniel Mills 2021-01-11 09:52:53 -05:00
parent 3811dd3554
commit 45cef6a752
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/volmit/iris/manager/command/CommandIrisStudioGoto.java
View File

@ -3,7 +3,6 @@ package com.volmit.iris.manager.command;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.manager.IrisDataManager;
import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisBiome;
import com.volmit.iris.object.IrisObject;
import com.volmit.iris.object.IrisRegion; import com.volmit.iris.object.IrisRegion;
import com.volmit.iris.scaffold.IrisWorlds; import com.volmit.iris.scaffold.IrisWorlds;
import com.volmit.iris.scaffold.engine.IrisAccess; import com.volmit.iris.scaffold.engine.IrisAccess;
@ -17,7 +16,7 @@ public class CommandIrisStudioGoto extends MortarCommand
public CommandIrisStudioGoto() public CommandIrisStudioGoto()
{ {
super("goto", "find", "g", "tp"); super("goto", "find", "g", "tp");
setDescription("Find any region, biome or placed object"); setDescription("Find any region or biome");
requiresPermission(Iris.perm.studio); requiresPermission(Iris.perm.studio);
setCategory("World"); setCategory("World");
} }
@ -56,7 +55,6 @@ public class CommandIrisStudioGoto extends MortarCommand
IrisAccess g = IrisWorlds.access(world); IrisAccess g = IrisWorlds.access(world);
IrisBiome b = IrisDataManager.loadAnyBiome(args[0]); IrisBiome b = IrisDataManager.loadAnyBiome(args[0]);
IrisRegion r = IrisDataManager.loadAnyRegion(args[0]); IrisRegion r = IrisDataManager.loadAnyRegion(args[0]);
IrisObject o = IrisDataManager.loadAnyObject(args[0]);
if(b != null) if(b != null)
{ {
@ -94,24 +92,6 @@ public class CommandIrisStudioGoto extends MortarCommand
}); });
} }
else if(o != null)
{
J.a(() -> {
Location l = g.lookForObject(o, 60000, (v) -> sender.sendMessage(C.BOLD +""+ C.WHITE + o.getLoadKey() + C.RESET + C.GRAY + ": Checked " + Form.f(v) + " Objects"));
if(l == null)
{
sender.sendMessage("Couldn't find " + o.getLoadKey() + ".");
}
else
{
sender.sendMessage("Found " + o.getLoadKey() + "!");
J.s(() -> sender.player().teleport(l));
}
});
}
else else
{ {
sender.sendMessage(args[0] + " is not a biome,region or object in this dimension."); sender.sendMessage(args[0] + " is not a biome,region or object in this dimension.");