mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2025-06-11 20:13:55 +00:00
Added a method to teleport entities across worlds.
This commit is contained in:
@ -54,6 +54,14 @@ public interface Entity extends Faceted {
|
||||
*/
|
||||
Location getLocation();
|
||||
|
||||
/**
|
||||
* Sets the location of this entity.
|
||||
*
|
||||
* @param location the new location of the entity
|
||||
* @return if the teleport worked
|
||||
*/
|
||||
boolean setLocation(Location location);
|
||||
|
||||
/**
|
||||
* Get the extent that this entity is on.
|
||||
*
|
||||
|
@ -97,6 +97,11 @@ class PlayerProxy extends AbstractPlayerActor {
|
||||
return basePlayer.getLocation();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean setLocation(Location location) {
|
||||
return basePlayer.setLocation(location);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPosition(Vector3 pos, float pitch, float yaw) {
|
||||
basePlayer.setPosition(pos, pitch, yaw);
|
||||
|
@ -110,6 +110,12 @@ public class ChangeSetExtent extends AbstractDelegateExtent {
|
||||
return entity.getLocation();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean setLocation(Location location) {
|
||||
// TODO Add a changeset for this.
|
||||
return entity.setLocation(location);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Extent getExtent() {
|
||||
return entity.getExtent();
|
||||
|
@ -68,6 +68,11 @@ abstract class StoredEntity implements Entity {
|
||||
return location;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean setLocation(Location location) {
|
||||
throw new IllegalArgumentException("StoredEntities are immutable");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Extent getExtent() {
|
||||
return location.getExtent();
|
||||
|
@ -0,0 +1,46 @@
|
||||
/*
|
||||
* WorldEdit, a Minecraft world manipulation toolkit
|
||||
* Copyright (C) sk89q <http://www.sk89q.com>
|
||||
* Copyright (C) WorldEdit team and contributors
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published by the
|
||||
* Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
|
||||
* for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.sk89q.worldedit.util.gson;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonDeserializer;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonParseException;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
|
||||
public class BlockVectorAdapter implements JsonDeserializer<BlockVector3> {
|
||||
|
||||
@Override
|
||||
public BlockVector3 deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
||||
JsonArray jsonArray = json.getAsJsonArray();
|
||||
if (jsonArray.size() != 3) {
|
||||
throw new JsonParseException("Expected array of 3 length for BlockVector3");
|
||||
}
|
||||
|
||||
double x = jsonArray.get(0).getAsInt();
|
||||
double y = jsonArray.get(1).getAsInt();
|
||||
double z = jsonArray.get(2).getAsInt();
|
||||
|
||||
return BlockVector3.at(x, y, z);
|
||||
}
|
||||
}
|
@ -21,6 +21,7 @@ package com.sk89q.worldedit.util.gson;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.sk89q.worldedit.math.BlockVector3;
|
||||
import com.sk89q.worldedit.math.Vector3;
|
||||
|
||||
/**
|
||||
@ -39,6 +40,7 @@ public final class GsonUtil {
|
||||
public static GsonBuilder createBuilder() {
|
||||
GsonBuilder gsonBuilder = new GsonBuilder();
|
||||
gsonBuilder.registerTypeAdapter(Vector3.class, new VectorAdapter());
|
||||
gsonBuilder.registerTypeAdapter(BlockVector3.class, new BlockVectorAdapter());
|
||||
return gsonBuilder;
|
||||
}
|
||||
|
||||
|
@ -29,7 +29,7 @@ import com.sk89q.worldedit.math.Vector3;
|
||||
import java.lang.reflect.Type;
|
||||
|
||||
/**
|
||||
* Deserializes {@code Vector}s for GSON.
|
||||
* Deserializes {@code Vector3}s for GSON.
|
||||
*/
|
||||
public class VectorAdapter implements JsonDeserializer<Vector3> {
|
||||
|
||||
@ -37,7 +37,7 @@ public class VectorAdapter implements JsonDeserializer<Vector3> {
|
||||
public Vector3 deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
||||
JsonArray jsonArray = json.getAsJsonArray();
|
||||
if (jsonArray.size() != 3) {
|
||||
throw new JsonParseException("Expected array of 3 length for Vector");
|
||||
throw new JsonParseException("Expected array of 3 length for Vector3");
|
||||
}
|
||||
|
||||
double x = jsonArray.get(0).getAsDouble();
|
||||
|
Reference in New Issue
Block a user