SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Revert Extent.createEntity() taking a Vector.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
sk89q 2014-07-10 14:50:40 -07:00
Ursprung d50cd89005
Commit c564278dd6
9 geänderte Dateien mit 21 neuen und 21 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
src/bukkit/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
Datei anzeigen

@ -233,7 +233,7 @@ public class BukkitWorld extends LocalWorld {
@Nullable
@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");
}

3
src/forge/java/com/sk89q/worldedit/forge/ForgeWorld.java
Datei anzeigen

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

4
src/main/java/com/sk89q/worldedit/EditSession.java
Datei anzeigen

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

6
src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java
Datei anzeigen

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

5
src/main/java/com/sk89q/worldedit/extent/Extent.java
Datei anzeigen

@ -22,6 +22,7 @@ package com.sk89q.worldedit.extent;
import com.sk89q.worldedit.Vector;
import com.sk89q.worldedit.entity.BaseEntity;
import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.util.Location;
import javax.annotation.Nullable;
import java.util.List;
@ -69,10 +70,10 @@ public interface Extent extends InputExtent, OutputExtent {
/**
* Create an entity at the given location.
*
* @param position the position
* @param entity the entity
* @param location the location
* @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);
}

3
src/main/java/com/sk89q/worldedit/extent/NullExtent.java
Datei anzeigen

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

4
src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java
Datei anzeigen

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

4
src/main/java/com/sk89q/worldedit/internal/LocalWorldAdapter.java
Datei anzeigen

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

11
src/main/java/com/sk89q/worldedit/world/NullWorld.java
Datei anzeigen

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