Revert Extent.createEntity() taking a Vector.

This commit is contained in:
sk89q 2014-07-10 14:50:40 -07:00
parent d50cd89005
commit c564278dd6
9 changed files with 21 additions and 21 deletions

View File

@ -233,7 +233,7 @@ public class BukkitWorld extends LocalWorld {
@Nullable @Nullable
@Override @Override
public com.sk89q.worldedit.entity.Entity createEntity(Vector position, BaseEntity entity) { public com.sk89q.worldedit.entity.Entity createEntity(com.sk89q.worldedit.util.Location location, BaseEntity entity) {
throw new UnsupportedOperationException("Not implemented yet"); throw new UnsupportedOperationException("Not implemented yet");
} }

View File

@ -33,6 +33,7 @@ import com.sk89q.worldedit.blocks.LazyBlock;
import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.util.TreeGenerator.TreeType; import com.sk89q.worldedit.util.TreeGenerator.TreeType;
import com.sk89q.worldedit.world.AbstractWorld; import com.sk89q.worldedit.world.AbstractWorld;
import com.sk89q.worldedit.world.registry.LegacyWorldData; import com.sk89q.worldedit.world.registry.LegacyWorldData;
@ -509,7 +510,7 @@ public class ForgeWorld extends AbstractWorld {
@Nullable @Nullable
@Override @Override
public Entity createEntity(Vector position, BaseEntity entity) { public Entity createEntity(Location location, BaseEntity entity) {
World world = getWorld(); World world = getWorld();
net.minecraft.entity.Entity createdEntity = EntityList.createEntityByName(entity.getTypeId(), world); net.minecraft.entity.Entity createdEntity = EntityList.createEntityByName(entity.getTypeId(), world);
if (createdEntity != null) { if (createdEntity != null) {

View File

@ -589,8 +589,8 @@ public class EditSession implements Extent {
@Override @Override
@Nullable @Nullable
public Entity createEntity(Vector position, BaseEntity entity) { public Entity createEntity(com.sk89q.worldedit.util.Location location, BaseEntity entity) {
return world.createEntity(position, entity); return world.createEntity(location, entity);
} }
/** /**

View File

@ -26,8 +26,10 @@ import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.function.operation.Operation; import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.function.operation.OperationQueue; import com.sk89q.worldedit.function.operation.OperationQueue;
import com.sk89q.worldedit.util.Location;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
@ -75,8 +77,8 @@ public abstract class AbstractDelegateExtent implements Extent {
@Override @Override
@Nullable @Nullable
public Entity createEntity(Vector position, BaseEntity entity) { public Entity createEntity(Location location, BaseEntity entity) {
return extent.createEntity(position, entity); return extent.createEntity(location, entity);
} }
@Override @Override

View File

@ -22,6 +22,7 @@ package com.sk89q.worldedit.extent;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.util.Location;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
@ -69,10 +70,10 @@ public interface Extent extends InputExtent, OutputExtent {
/** /**
* Create an entity at the given location. * Create an entity at the given location.
* *
* @param position the position
* @param entity the entity * @param entity the entity
* @param location the location
* @return a reference to the created entity, or null if the entity could not be created * @return a reference to the created entity, or null if the entity could not be created
*/ */
@Nullable Entity createEntity(Vector position, BaseEntity entity); @Nullable Entity createEntity(Location location, BaseEntity entity);
} }

View File

@ -25,6 +25,7 @@ import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.function.operation.Operation; import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.util.Location;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Collections; import java.util.Collections;
@ -55,7 +56,7 @@ public class NullExtent implements Extent {
@Nullable @Nullable
@Override @Override
public Entity createEntity(Vector position, BaseEntity entity) { public Entity createEntity(Location location, BaseEntity entity) {
return null; return null;
} }

View File

@ -99,8 +99,8 @@ public class BlockArrayClipboard implements Clipboard {
@Nullable @Nullable
@Override @Override
public Entity createEntity(Vector position, BaseEntity entity) { public Entity createEntity(Location location, BaseEntity entity) {
ClipboardEntity ret = new ClipboardEntity(new Location(this, position), entity); ClipboardEntity ret = new ClipboardEntity(location, entity);
entities.add(ret); entities.add(ret);
return ret; return ret;
} }

View File

@ -330,8 +330,8 @@ public class LocalWorldAdapter extends LocalWorld {
@Override @Override
@Nullable @Nullable
public Entity createEntity(Vector position, BaseEntity entity) { public Entity createEntity(com.sk89q.worldedit.util.Location location, BaseEntity entity) {
return world.createEntity(position, entity); return world.createEntity(location, entity);
} }
@Override @Override

View File

@ -19,19 +19,14 @@
package com.sk89q.worldedit.world; package com.sk89q.worldedit.world;
import com.sk89q.worldedit.BiomeType; import com.sk89q.worldedit.*;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.EntityType;
import com.sk89q.worldedit.MaxChangedBlocksException;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.Vector2D;
import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.blocks.BaseItemStack; import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.BlockID; import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.util.TreeGenerator.TreeType; import com.sk89q.worldedit.util.TreeGenerator.TreeType;
import com.sk89q.worldedit.world.registry.LegacyWorldData; import com.sk89q.worldedit.world.registry.LegacyWorldData;
import com.sk89q.worldedit.world.registry.WorldData; import com.sk89q.worldedit.world.registry.WorldData;
@ -121,7 +116,7 @@ public class NullWorld extends AbstractWorld {
@Nullable @Nullable
@Override @Override
public Entity createEntity(Vector position, BaseEntity entity) { public Entity createEntity(Location location, BaseEntity entity) {
return null; return null;
} }
} }