Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-02-11 18:11:49 +01:00
Code Issues Projects Releases Wiki Activity

Remove old Dest References

Browse Source
This commit is contained in:
Eric Stokes 2011-07-22 23:34:10 -06:00
parent e0ebfdb806
commit 45c76d8faa
3 changed files with 1 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java
View File

@ -12,13 +12,10 @@ import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault; import org.bukkit.permissions.PermissionDefault;
import com.onarandombox.MultiverseCore.MVTeleport; import com.onarandombox.MultiverseCore.MVTeleport;
import com.onarandombox.MultiverseCore.MVWorld;
import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.utils.Destination; import com.onarandombox.utils.Destination;
import com.onarandombox.utils.DestinationFactory; import com.onarandombox.utils.DestinationFactory;
import com.onarandombox.utils.DestinationType;
import com.onarandombox.utils.InvalidDestination; import com.onarandombox.utils.InvalidDestination;
import com.onarandombox.utils.WorldDestination;
public class TeleportCommand extends MultiverseCommand { public class TeleportCommand extends MultiverseCommand {
private MVTeleport playerTeleporter; private MVTeleport playerTeleporter;
@ -110,6 +107,7 @@ public class TeleportCommand extends MultiverseCommand {
teleporter.sendMessage("Sorry Boss, I tried everything, but just couldn't teleport ya there!"); teleporter.sendMessage("Sorry Boss, I tried everything, but just couldn't teleport ya there!");
return; return;
} }
// TODO: Put our teleporter back in...
teleportee.teleport(l); teleportee.teleport(l);
} }
} }

5
src/main/java/com/onarandombox/utils/DestinationType.java
View File

@ -1,5 +0,0 @@
package com.onarandombox.utils;
public enum DestinationType {
World, Portal, Exact, Invalid
}

128
src/main/java/com/onarandombox/utils/OldDestination.java
View File

@ -1,128 +0,0 @@
package com.onarandombox.utils;
import java.util.Arrays;
import java.util.List;
import org.bukkit.Location;
import org.bukkit.World;
import com.onarandombox.MultiverseCore.MultiverseCore;
@Deprecated
public class OldDestination {
private String name;
private Location location;
private DestinationType type;
private World world;
public OldDestination(String name, DestinationType type) {
this.name = name;
this.type = type;
if (name.split(":").length > 1) {
this.type = DestinationType.Invalid;
}
}
public OldDestination(String coordString) {
this.type = DestinationType.Invalid;
// if (this.setExactDest(coordString.split(":"))) {
// this.type = DestinationType.Exact;
// }
}
@Override
public String toString() {
// if (this.type == DestinationType.Portal) {
// return "p:" + this.name;
// } else if (this.type == DestinationType.World) {
// return "w:" + this.name;
// } else if (this.type == DestinationType.Exact) {
// return "e:" + this.name + ":" + this.x + "," + this.y + "," + this.z + ":" + this.pitch + ":" + this.yaw;
// }
return "i:" + this.name;
}
public String getName() {
return this.name;
}
public DestinationType getType() {
return this.type;
}
private static OldDestination getBadDestination() {
return new OldDestination("", DestinationType.Invalid);
}
/**
* Takes the given string and returns a Destination. This will NEVER be NULL. It will return a destination of type Invalid if the destination is bad.
*
* @param dest The parceable string, ex: w:My World
* @param plugin The MultiverseCore plugin used to find valid worlds/portals
* @return A new Destination from the parsed string.
*/
public static OldDestination parseDestination(String dest, MultiverseCore plugin) {
if (dest == null) {
return getBadDestination();
}
String[] items = dest.split(":");
if (items.length == 0) {
return getBadDestination();
}
if (items.length == 1 && items[0].equalsIgnoreCase("here")) {
return new OldDestination(items[0], DestinationType.Exact);
}
// If we only found one param, assume world, but still check for validity
if (items.length == 1 && plugin.isMVWorld(items[0])) {
return new OldDestination(items[0], DestinationType.World);
}
if (items[0].equalsIgnoreCase("w") && plugin.isMVWorld(items[1])) {
return new OldDestination(items[1], DestinationType.World);
} else if (items[0].equalsIgnoreCase("p")) {
// TODO: Check for a valid portal, we can't right now, as portals aren't really in yet.
return new OldDestination(items[1], DestinationType.Portal);
} else if (items[0].equalsIgnoreCase("e")) {
return new OldDestination(dest);
}
System.out.print("Nothing valid found!!");
return getBadDestination();
}
// private boolean setExactDest(String[] items) {
// List<String> parsed = Arrays.asList(items);
// // we already know this is an 'e'
//
// parsed.remove(0);
// // e:name:x,y,z:pitch:yaw
// this.name = parsed.remove(0);
// this.
// String[] coordString = parsed.get(0).split(",");
// Double[] coords = new Double[3];
// for (int i = 0; i < 3; i++) {
// try {
// coords[i] = Double.parseDouble(coordString[0]);
// } catch (NumberFormatException e) {
// return false;
// }
// }
// if (parsed.size() == 1) {
// // We parsed with X, Y, And Z, we're good to go!
// location = new Location(this.world, coords[0], coords[1], coords[2]);
// return true;
// }
// if (parsed.size() == 3) {
// try {
// this.pitch = Double.parseDouble(parsed.get(1));
// this.yaw = Double.parseDouble(parsed.get(1));
// } catch (NumberFormatException e) {
// return false;
// }
// return true;
// }
// return false;
// }
}