Skip to content

Fixes bugs with copy entities from Position A to Position B #2195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fixes bugs with copy entities from Position A to Position B #2195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
87717ba
Fix passage entities
TheMeinerLP Apr 29, 2023
487b2ba
Add dirty workaround to fix leashes when copy entities
TheMeinerLP Apr 29, 2023
171e8ca
Add 1.19.3 support for leash copy
TheMeinerLP Apr 29, 2023
ac4e151
Add 1.18.X support for leash copy
TheMeinerLP Apr 29, 2023
b44d08e
Add dirty workaround to fix leashes when copy entities
TheMeinerLP Apr 29, 2023
3a188d0
Fix 1.205 and 1.21 compatible
TheMeinerLP Aug 11, 2024
9ec03da
Refactor leash entity handling in clipboard copy
TheMeinerLP Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,7 @@ protected <T extends Future<T>> T internalCall(

syncTasks[1] = () -> {
Iterator<FaweCompoundTag> iterator = entities.iterator();
// TODO: TheMeinerLP: Add LeashKnot again
while (iterator.hasNext()) {
final FaweCompoundTag nativeTag = iterator.next();
final LinCompoundTag linTag = nativeTag.linTag();
Expand All @@ -675,6 +676,7 @@ protected <T extends Future<T>> T internalCall(
Entity entity = type.create(nmsWorld);
if (entity != null) {
final CompoundTag tag = (CompoundTag) adapter.fromNativeLin(linTag);
// TODO: TheMeinerLP: Add LeashKnot again
for (final String name : Constants.NO_COPY_ENTITY_NBT_FIELDS) {
tag.remove(name);
}
Expand Down
2 changes: 2 additions & 0 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,12 +676,14 @@ protected <T extends Future<T>> T internalCall(
if (entity != null) {
final net.minecraft.nbt.CompoundTag tag = (net.minecraft.nbt.CompoundTag) adapter.fromNativeLin(
linTag);
// TODO: TheMeinerLP: Add LeashKnot again
for (final String name : Constants.NO_COPY_ENTITY_NBT_FIELDS) {
tag.remove(name);
}
entity.load(tag);
entity.absMoveTo(x, y, z, yaw, pitch);
entity.setUUID(NbtUtils.uuid(nativeTag));
// TODO: TheMeinerLP: Add LeashKnot again
if (!nmsWorld.addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM)) {
LOGGER.warn(
"Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
Expand Down
3 changes: 3 additions & 0 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,7 @@ protected <T extends Future<T>> T internalCall(

syncTasks[1] = () -> {
Iterator<FaweCompoundTag> iterator = entities.iterator();
// TODO: TheMeinerLP: Add LeashKnot again
while (iterator.hasNext()) {
final FaweCompoundTag nativeTag = iterator.next();
final LinCompoundTag linTag = nativeTag.linTag();
Expand All @@ -677,12 +678,14 @@ protected <T extends Future<T>> T internalCall(
if (entity != null) {
final net.minecraft.nbt.CompoundTag tag = (net.minecraft.nbt.CompoundTag) adapter.fromNativeLin(
linTag);
// TODO: TheMeinerLP: Add LeashKnot again
for (final String name : Constants.NO_COPY_ENTITY_NBT_FIELDS) {
tag.remove(name);
}
entity.load(tag);
entity.absMoveTo(x, y, z, yaw, pitch);
entity.setUUID(NbtUtils.uuid(nativeTag));
// TODO: TheMeinerLP: Add LeashKnot again
if (!nmsWorld.addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM)) {
LOGGER.warn(
"Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
Expand Down
3 changes: 3 additions & 0 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,7 @@ protected <T extends Future<T>> T internalCall(

syncTasks[1] = () -> {
Iterator<FaweCompoundTag> iterator = entities.iterator();
// TODO: TheMeinerLP: Add LeashKnot again
while (iterator.hasNext()) {
final FaweCompoundTag nativeTag = iterator.next();
final LinCompoundTag linTag = nativeTag.linTag();
Expand All @@ -674,12 +675,14 @@ protected <T extends Future<T>> T internalCall(
Entity entity = type.create(nmsWorld);
if (entity != null) {
final CompoundTag tag = (CompoundTag) adapter.fromNativeLin(linTag);
// TODO: TheMeinerLP: Add LeashKnot again
for (final String name : Constants.NO_COPY_ENTITY_NBT_FIELDS) {
tag.remove(name);
}
entity.load(tag);
entity.absMoveTo(x, y, z, yaw, pitch);
entity.setUUID(NbtUtils.uuid(nativeTag));
// TODO: TheMeinerLP: Add LeashKnot again
if (!nmsWorld.addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM)) {
LOGGER.warn(
"Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
Expand Down
2 changes: 1 addition & 1 deletion worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/IChunkExtent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ default Entity createEntity(Location location, BaseEntity entity, UUID uuid) {
posList.add(LinDoubleTag.of(location.y()));
posList.add(LinDoubleTag.of(location.z()));
map.put("Pos", LinListTag.of(LinTagType.doubleTag(), posList));

// Todo: Add again rotation
NbtUtils.addUUIDToMap(map, uuid);

chunk.entity(FaweCompoundTag.of(LinCompoundTag.of(map)));
Expand Down
5 changes: 5 additions & 0 deletions worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/Clipboard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
import com.fastasyncworldedit.core.function.visitor.Order;
import com.fastasyncworldedit.core.queue.Filter;
import com.fastasyncworldedit.core.util.MaskTraverser;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.jnbt.IntTag;
import com.sk89q.jnbt.Tag;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.EditSessionBuilder;
import com.sk89q.worldedit.WorldEdit;
Expand All @@ -49,6 +52,7 @@
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.entity.EntityTypes;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
Expand All @@ -59,6 +63,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.net.URI;
import java.util.HashMap;
import java.util.Iterator;
import java.util.UUID;

Expand Down
Loading