Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-05 12:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into new-vector-system

Browse Source 
# Conflicts:
#	build.gradle
#	worldedit-core/build.gradle
#	worldedit-core/src/main/java/com/boydti/fawe/util/IncendoPaster.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java

#	worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java
This commit is contained in:
Jesse Boyd
2019-04-01 23:50:16 +11:00
parent bf53194650 603df92f79
commit 64a134a9ee
6 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java
View File

@ -356,7 +356,8 @@ public class ForwardExtentCopy implements Operation {
entities = source.getEntities()
.stream()
.filter(entity -> entity.getState() != null &&
entity.getState().getType().getId().equals("minecraft:player"))
!entity.getState().getType().getId().equals("minecraft:player") &&
region.contains(entity.getLocation().toVector()))
.collect(Collectors.toList());
} else {
entities = new ArrayList<>();