Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-18 01:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Final changes for the Vector update (probable fix for the "copying player entity" bug)

Browse Source
This commit is contained in:
IronApollo 2019-01-17 05:23:47 -05:00
parent cd1d45b856
commit 271b45f3ba
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/Spigot_v1_13_R2.java
View File

@ -52,6 +52,7 @@ import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
import org.bukkit.craftbukkit.v1_13_R2.block.CraftBlock; import org.bukkit.craftbukkit.v1_13_R2.block.CraftBlock;
import org.bukkit.craftbukkit.v1_13_R2.block.data.CraftBlockData; import org.bukkit.craftbukkit.v1_13_R2.block.data.CraftBlockData;
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity; import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
import org.bukkit.entity.EntityType;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -328,7 +329,7 @@ public final class Spigot_v1_13_R2 extends CachedBukkitAdapter implements Bukkit
public org.bukkit.entity.Entity createEntity(Location location, BaseEntity state) { public org.bukkit.entity.Entity createEntity(Location location, BaseEntity state) {
checkNotNull(location); checkNotNull(location);
checkNotNull(state); checkNotNull(state);
if (state.getType() == com.sk89q.worldedit.world.entity.EntityTypes.PLAYER) return null;
CraftWorld craftWorld = ((CraftWorld) location.getWorld()); CraftWorld craftWorld = ((CraftWorld) location.getWorld());
WorldServer worldServer = craftWorld.getHandle(); WorldServer worldServer = craftWorld.getHandle();

3
worldedit-core/src/main/java/com/sk89q/worldedit/function/entity/ExtentEntityCopy.java
View File

@ -38,6 +38,7 @@ import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.math.transform.Transform; import com.sk89q.worldedit.math.transform.Transform;
import com.sk89q.worldedit.util.Direction; import com.sk89q.worldedit.util.Direction;
import com.sk89q.worldedit.util.Direction.Flag; import com.sk89q.worldedit.util.Direction.Flag;
import com.sk89q.worldedit.world.entity.EntityTypes;
import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.Location;
import java.util.Arrays; import java.util.Arrays;
import java.util.Map; import java.util.Map;
@ -97,7 +98,7 @@ public class ExtentEntityCopy implements EntityFunction {
@Override @Override
public boolean apply(Entity entity) throws WorldEditException { public boolean apply(Entity entity) throws WorldEditException {
BaseEntity state = entity.getState(); BaseEntity state = entity.getState();
if (state != null) { if (state != null && state.getType() != EntityTypes.PLAYER) {
Location newLocation; Location newLocation;
Location location = entity.getLocation(); Location location = entity.getLocation();