feat: improved entity operations #2356

dordsor21 · 2023-07-15T12:00:15Z

Add new extent that does an action on chunk GET load allowing for "unloaded" entities to be edited
closes Copying + pasting entities works only over a distance of viewdistance + 2 chunks #1826

- Add new extent that does an action on chunk GET load - closes #1826

github-actions · 2023-10-22T10:51:44Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

github-actions · 2023-11-26T12:31:37Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

NotMyFault · 2023-12-08T06:33:38Z

Please rebase for 1.20.3/4

github-actions · 2024-03-04T06:34:08Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

# Conflicts: # worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/ChunkHolder.java

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/OncePerChunkExtent.java

worldedit-core/src/main/java/com/fastasyncworldedit/core/math/LocalBlockVector2Set.java

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/OncePerChunkExtent.java

...rc/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java

SirYwell · 2024-03-16T17:09:25Z

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

-            });
+            IQueueExtent<IQueueChunk> queue;
+            Extent ext = source instanceof AbstractDelegateExtent ex ? ex.getExtent() : source;
+            ParallelQueueExtent parallel = new ExtentTraverser<>(source).findAndGet(ParallelQueueExtent.class);


This doesn't seem to work, I'm getting a Could not find IQueueExtent instance for entity retrieval, falling back to default method. From a quick look, findAndGet calls find(Object) instead of find(Class). Replacing the call with find((Class<Extent>) clazz) makes that work, but it seems like I'm running in some kind of deadlock then.

Are you able to find what causes the deadlock?

I got the following exception after >10 seconds:

java.lang.NullPointerException: Cannot read field "r" because "levelChunk" is null at com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R3.PaperweightGetBlocks_Copy.<init>(PaperweightGetBlocks_Copy.java:54) ~[FastAsyncWorldEdit-Bukkit-2.9.2-SNAPSHOT.jar:?] at com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R3.PaperweightGetBlocks.call(PaperweightGetBlocks.java:380) ~[FastAsyncWorldEdit-Bukkit-2.9.2-SNAPSHOT.jar:?] at com.fastasyncworldedit.core.queue.implementation.chunk.ChunkHolder.call(ChunkHolder.java:1044) ~[FastAsyncWorldEdit-Bukkit-2.9.2-SNAPSHOT.jar:?] at com.fastasyncworldedit.core.queue.implementation.chunk.ChunkHolder.call(ChunkHolder.java:1015) ~[FastAsyncWorldEdit-Bukkit-2.9.2-SNAPSHOT.jar:?] at com.fastasyncworldedit.core.queue.implementation.chunk.ChunkHolder.call(ChunkHolder.java:35) ~[FastAsyncWorldEdit-Bukkit-2.9.2-SNAPSHOT.jar:?]

I'll try to find out more

Okay that seems to happen after pasting only, not sure what went wrong with copying before, I cannot reproduce it anymore

github-actions · 2024-03-17T07:39:18Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

.../main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightGetBlocks.java

# Conflicts: # worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightGetBlocks.java # worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightGetBlocks_Copy.java # worldedit-bukkit/adapters/adapter-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightPostProcessor.java

SirYwell · 2024-03-18T17:23:52Z

I'm only seeing any FAWE block changes only after rejoining, not sure why though.

dordsor21 · 2024-04-06T10:25:14Z

I'm only seeing any FAWE block changes only after rejoining, not sure why though.

I can't replicate this, but I have, however, found that copy now copies entities in the full chunks aha

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

SirYwell

I can't reproduce the invisible change issue anymore. The changes seem to work from my testing and the code looks good.

github-actions · 2024-05-19T11:34:32Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

# Conflicts: # worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightGetBlocks.java

feat: implement "unloaded-entity" operations

6abf7f3

- Add new extent that does an action on chunk GET load - closes #1826

dordsor21 requested a review from a team as a code owner July 15, 2023 12:00

github-actions bot added the Feature This PR adds a new feature label Jul 15, 2023

dordsor21 added 5 commits July 15, 2023 14:41

minor changes

5969d99

add getter and setter for task

80c9614

Merge branch 'main' into feat/improved-entity-operations

d987643

Merge branch 'main' into feat/improved-entity-operations

2a45fcd

Update new adapter classes

ed30e5b

github-actions bot added the unresolved-merge-conflict label Oct 22, 2023

Merge branch 'main' into feat/improved-entity-operations

217231e

dordsor21 removed the unresolved-merge-conflict label Oct 22, 2023

dordsor21 added 2 commits November 18, 2023 15:48

Merge branch 'main' into feat/improved-entity-operations

6faa13f

fixes after merge

ea6b43e

github-actions bot added the unresolved-merge-conflict label Nov 26, 2023

Merge branch 'main' into feat/improved-entity-operations

69e815e

github-actions bot removed the unresolved-merge-conflict label Nov 26, 2023

dordsor21 added 3 commits December 12, 2023 17:08

Merge branch 'main' into feat/improved-entity-operations

874311f

Add changes to 1.20.4 adapters

01b980a

Merge branch 'main' into feat/improved-entity-operations

107d574

github-actions bot added the unresolved-merge-conflict label Mar 4, 2024

Merge branch 'main' into feat/improved-entity-operations

4df7961

# Conflicts: # worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/ChunkHolder.java

github-actions bot removed the unresolved-merge-conflict label Mar 16, 2024

SirYwell requested changes Mar 16, 2024

View reviewed changes

Address comments

936f5b7

dordsor21 requested a review from SirYwell March 16, 2024 15:44

SirYwell reviewed Mar 16, 2024

View reviewed changes

github-actions bot added the unresolved-merge-conflict label Mar 17, 2024

dordsor21 added 2 commits March 17, 2024 08:49

Adjust order in adapters to ensure chunk is loaded when copied

b12ea15

Fix findAndGet in ExtentTraverser

169d005

SirYwell reviewed Mar 17, 2024

View reviewed changes

.../main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_17_R1_2/PaperweightGetBlocks.java Outdated Show resolved Hide resolved

dordsor21 added 2 commits March 17, 2024 09:07

Utilise if for copy creation

249c567

github-actions bot removed the unresolved-merge-conflict label Mar 17, 2024

SirYwell mentioned this pull request Mar 24, 2024

Use correct find class in ExtentTraverser #2649

Merged

dordsor21 added 3 commits March 24, 2024 18:03

Merge branch 'main' into feat/improved-entity-operations

f94d752

Merge branch 'main' into feat/improved-entity-operations

1f0ac12

Merge branch 'main' into feat/improved-entity-operations

7b241ef

extend to lazy clipboard

040c98d

SirYwell reviewed Apr 6, 2024

View reviewed changes

worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java Outdated Show resolved Hide resolved

remove EntityHolder

c7d02e4

SirYwell approved these changes Apr 6, 2024

View reviewed changes

dordsor21 requested a review from a team April 12, 2024 10:06

github-actions bot added the unresolved-merge-conflict label May 19, 2024

Merge branch 'main' into feat/improved-entity-operations

ef071fa

# Conflicts: # worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightGetBlocks.java

github-actions bot removed the unresolved-merge-conflict label May 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: improved entity operations #2356

feat: improved entity operations #2356

dordsor21 commented Jul 15, 2023

github-actions bot commented Oct 22, 2023

github-actions bot commented Nov 26, 2023

NotMyFault commented Dec 8, 2023

github-actions bot commented Mar 4, 2024

SirYwell Mar 16, 2024

dordsor21 Mar 16, 2024

SirYwell Mar 16, 2024

SirYwell Mar 16, 2024

github-actions bot commented Mar 17, 2024

SirYwell commented Mar 18, 2024

dordsor21 commented Apr 6, 2024

SirYwell left a comment

github-actions bot commented May 19, 2024

feat: improved entity operations #2356

Are you sure you want to change the base?

feat: improved entity operations #2356

Conversation

dordsor21 commented Jul 15, 2023

github-actions bot commented Oct 22, 2023

github-actions bot commented Nov 26, 2023

NotMyFault commented Dec 8, 2023

github-actions bot commented Mar 4, 2024

SirYwell Mar 16, 2024

Choose a reason for hiding this comment

dordsor21 Mar 16, 2024

Choose a reason for hiding this comment

SirYwell Mar 16, 2024

Choose a reason for hiding this comment

SirYwell Mar 16, 2024

Choose a reason for hiding this comment

github-actions bot commented Mar 17, 2024

SirYwell commented Mar 18, 2024

dordsor21 commented Apr 6, 2024

SirYwell left a comment

Choose a reason for hiding this comment

github-actions bot commented May 19, 2024