Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allows use of chunks in TypePS

Browse Source
This commit is contained in:
BuildTools 2015-12-14 14:28:11 +01:00 committed by Olof Larsson
parent d2da879752
commit 00e297cceb
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/massivecraft/massivecore/command/type/TypePS.java
View File

@ -5,6 +5,7 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.Location;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@ -47,9 +48,17 @@ public class TypePS extends TypeAbstract<PS>
// lx15 ly32 lz99 wEllador // lx15 ly32 lz99 wEllador
// lx:15 ly:32 lz:99 w:Ellador // lx:15 ly:32 lz:99 w:Ellador
// We get the sender ps // We get the sender ps (note only pitch, yaw, and world is implicit)
PS senderPs = new PSBuilder().build(); PS defaultPs = PS.NULL;
if (sender instanceof Entity) senderPs = PS.valueOf((Entity)sender); if (sender instanceof Entity)
{
Location loc = ((Entity) sender).getLocation();
defaultPs = new PSBuilder()
.world(PS.calcWorldName(loc.getWorld()))
.pitch(loc.getPitch())
.yaw(loc.getYaw())
.build();
}
// We remove all commas optionally followed by spaces // We remove all commas optionally followed by spaces
String argInner = arg.replaceAll("\\:\\s*", ""); String argInner = arg.replaceAll("\\:\\s*", "");
@ -66,7 +75,7 @@ public class TypePS extends TypeAbstract<PS>
double locationX = TypeDouble.get().read(parts.get(1), sender); double locationX = TypeDouble.get().read(parts.get(1), sender);
double locationY = TypeDouble.get().read(parts.get(2), sender); double locationY = TypeDouble.get().read(parts.get(2), sender);
double locationZ = TypeDouble.get().read(parts.get(3), sender); double locationZ = TypeDouble.get().read(parts.get(3), sender);
return new PSBuilder(senderPs).world(world).locationX(locationX).locationY(locationY).locationZ(locationZ).build(); return new PSBuilder(defaultPs).world(world).locationX(locationX).locationY(locationY).locationZ(locationZ).build();
} }
catch (Exception e) catch (Exception e)
{ {
@ -79,7 +88,7 @@ public class TypePS extends TypeAbstract<PS>
double locationY = TypeDouble.get().read(parts.get(1), sender); double locationY = TypeDouble.get().read(parts.get(1), sender);
double locationZ = TypeDouble.get().read(parts.get(2), sender); double locationZ = TypeDouble.get().read(parts.get(2), sender);
String world = TypeWorldId.get().read(parts.get(3), sender); String world = TypeWorldId.get().read(parts.get(3), sender);
return new PSBuilder(senderPs).world(world).locationX(locationX).locationY(locationY).locationZ(locationZ).build(); return new PSBuilder(defaultPs).world(world).locationX(locationX).locationY(locationY).locationZ(locationZ).build();
} }
catch (Exception e) catch (Exception e)
{ {
@ -93,7 +102,7 @@ public class TypePS extends TypeAbstract<PS>
double locationX = TypeDouble.get().read(parts.get(0), sender); double locationX = TypeDouble.get().read(parts.get(0), sender);
double locationY = TypeDouble.get().read(parts.get(1), sender); double locationY = TypeDouble.get().read(parts.get(1), sender);
double locationZ = TypeDouble.get().read(parts.get(2), sender); double locationZ = TypeDouble.get().read(parts.get(2), sender);
return new PSBuilder(senderPs).locationX(locationX).locationY(locationY).locationZ(locationZ).build(); return new PSBuilder(defaultPs).locationX(locationX).locationY(locationY).locationZ(locationZ).build();
} }
catch (Exception e) catch (Exception e)
{ {
@ -102,7 +111,7 @@ public class TypePS extends TypeAbstract<PS>
} }
// Then we split each entry using known prefixes and append the ps builder. // Then we split each entry using known prefixes and append the ps builder.
PSBuilder ret = new PSBuilder(senderPs); PSBuilder ret = new PSBuilder(defaultPs);
boolean something = false; boolean something = false;
for (String part : parts) for (String part : parts)
{ {