Skip to content

Fix crash due to data race when removing block entity #3152

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
SirYwell wants to merge 1 commit into
base: main
Choose a base branch
from
+189 −167
Open

Fix crash due to data race when removing block entity #3152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 31 additions & 27 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 @@ -13,6 +13,7 @@
import com.fastasyncworldedit.core.queue.IChunkSet;
import com.fastasyncworldedit.core.util.MathMan;
import com.fastasyncworldedit.core.util.NbtUtils;
import com.fastasyncworldedit.core.util.TaskManager;
import com.fastasyncworldedit.core.util.collection.AdaptedMap;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.BukkitEntity;
Expand Down Expand Up @@ -340,38 +341,41 @@ protected <T extends Future<T>> T internalCall(
}
copies.put(copyKey, copy);
}
// Remove existing tiles. Create a copy so that we can remove blocks
Map<BlockPos, BlockEntity> chunkTiles = new HashMap<>(nmsChunk.getBlockEntities());
List<BlockEntity> beacons = null;
if (!chunkTiles.isEmpty()) {
for (Map.Entry<BlockPos, BlockEntity> entry : chunkTiles.entrySet()) {
final BlockPos pos = entry.getKey();
final int lx = pos.getX() & 15;
final int ly = pos.getY();
final int lz = pos.getZ() & 15;
final int layer = ly >> 4;
if (!set.hasSection(layer)) {
continue;
}

int ordinal = set.getBlock(lx, ly, lz).getOrdinal();
if (ordinal != BlockTypesCache.ReservedIDs.__RESERVED__) {
BlockEntity tile = entry.getValue();
if (PaperLib.isPaper() && tile instanceof BeaconBlockEntity) {
if (beacons == null) {
beacons = new ArrayList<>();
}
beacons.add(tile);
PaperweightPlatformAdapter.removeBeacon(tile, nmsChunk);
List<BlockEntity> beacons = TaskManager.taskManager().sync(() -> {
// Remove existing tiles. Create a copy so that we can remove blocks
Map<BlockPos, BlockEntity> chunkTiles = new HashMap<>(nmsChunk.getBlockEntities());
List<BlockEntity> beaconEntities = null;
if (!chunkTiles.isEmpty()) {
for (Map.Entry<BlockPos, BlockEntity> entry : chunkTiles.entrySet()) {
final BlockPos pos = entry.getKey();
final int lx = pos.getX() & 15;
final int ly = pos.getY();
final int lz = pos.getZ() & 15;
final int layer = ly >> 4;
if (!set.hasSection(layer)) {
continue;
}
nmsChunk.removeBlockEntity(tile.getBlockPos());
if (createCopy) {
copy.storeTile(tile);

int ordinal = set.getBlock(lx, ly, lz).getOrdinal();
if (ordinal != BlockTypesCache.ReservedIDs.__RESERVED__) {
BlockEntity tile = entry.getValue();
if (PaperLib.isPaper() && tile instanceof BeaconBlockEntity) {
if (beaconEntities == null) {
beaconEntities = new ArrayList<>();
}
beaconEntities.add(tile);
PaperweightPlatformAdapter.removeBeacon(tile, nmsChunk);
continue;
}
nmsChunk.removeBlockEntity(tile.getBlockPos());
if (createCopy) {
copy.storeTile(tile);
}
}
}
}
}
return beaconEntities;
});
final BiomeType[][] biomes = set.getBiomes();

int bitMask = 0;
Expand Down
58 changes: 31 additions & 27 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 @@ -13,6 +13,7 @@
import com.fastasyncworldedit.core.queue.IChunkSet;
import com.fastasyncworldedit.core.util.MathMan;
import com.fastasyncworldedit.core.util.NbtUtils;
import com.fastasyncworldedit.core.util.TaskManager;
import com.fastasyncworldedit.core.util.collection.AdaptedMap;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.BukkitEntity;
Expand Down Expand Up @@ -340,38 +341,41 @@ protected <T extends Future<T>> T internalCall(
}
copies.put(copyKey, copy);
}
// Remove existing tiles. Create a copy so that we can remove blocks
Map<BlockPos, BlockEntity> chunkTiles = new HashMap<>(nmsChunk.getBlockEntities());
List<BlockEntity> beacons = null;
if (!chunkTiles.isEmpty()) {
for (Map.Entry<BlockPos, BlockEntity> entry : chunkTiles.entrySet()) {
final BlockPos pos = entry.getKey();
final int lx = pos.getX() & 15;
final int ly = pos.getY();
final int lz = pos.getZ() & 15;
final int layer = ly >> 4;
if (!set.hasSection(layer)) {
continue;
}

int ordinal = set.getBlock(lx, ly, lz).getOrdinal();
if (ordinal != BlockTypesCache.ReservedIDs.__RESERVED__) {
BlockEntity tile = entry.getValue();
if (PaperLib.isPaper() && tile instanceof BeaconBlockEntity) {
if (beacons == null) {
beacons = new ArrayList<>();
}
beacons.add(tile);
PaperweightPlatformAdapter.removeBeacon(tile, nmsChunk);
List<BlockEntity> beacons = TaskManager.taskManager().sync(() -> {
// Remove existing tiles. Create a copy so that we can remove blocks
Map<BlockPos, BlockEntity> chunkTiles = new HashMap<>(nmsChunk.getBlockEntities());
List<BlockEntity> beaconEntities = null;
Copy link

Copilot AI Apr 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider initializing beaconEntities to new ArrayList<>() instead of null so that the method consistently returns a non-null list.

Suggested change
List<BlockEntity> beaconEntities = null;
List<BlockEntity> beaconEntities = new ArrayList<>();

Copilot uses AI. Check for mistakes.
if (!chunkTiles.isEmpty()) {
for (Map.Entry<BlockPos, BlockEntity> entry : chunkTiles.entrySet()) {
final BlockPos pos = entry.getKey();
final int lx = pos.getX() & 15;
final int ly = pos.getY();
final int lz = pos.getZ() & 15;
final int layer = ly >> 4;
if (!set.hasSection(layer)) {
continue;
}
nmsChunk.removeBlockEntity(tile.getBlockPos());
if (createCopy) {
copy.storeTile(tile);

int ordinal = set.getBlock(lx, ly, lz).getOrdinal();
if (ordinal != BlockTypesCache.ReservedIDs.__RESERVED__) {
BlockEntity tile = entry.getValue();
if (PaperLib.isPaper() && tile instanceof BeaconBlockEntity) {
if (beaconEntities == null) {
beaconEntities = new ArrayList<>();
}
beaconEntities.add(tile);
PaperweightPlatformAdapter.removeBeacon(tile, nmsChunk);
continue;
}
nmsChunk.removeBlockEntity(tile.getBlockPos());
if (createCopy) {
copy.storeTile(tile);
}
}
}
}
}
return beaconEntities;
});
final BiomeType[][] biomes = set.getBiomes();

int bitMask = 0;
Expand Down
58 changes: 31 additions & 27 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 @@ -13,6 +13,7 @@
import com.fastasyncworldedit.core.queue.IChunkSet;
import com.fastasyncworldedit.core.util.MathMan;
import com.fastasyncworldedit.core.util.NbtUtils;
import com.fastasyncworldedit.core.util.TaskManager;
import com.fastasyncworldedit.core.util.collection.AdaptedMap;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.BukkitEntity;
Expand Down Expand Up @@ -341,38 +342,41 @@ protected <T extends Future<T>> T internalCall(
}
copies.put(copyKey, copy);
}
// Remove existing tiles. Create a copy so that we can remove blocks
Map<BlockPos, BlockEntity> chunkTiles = new HashMap<>(nmsChunk.getBlockEntities());
List<BlockEntity> beacons = null;
if (!chunkTiles.isEmpty()) {
for (Map.Entry<BlockPos, BlockEntity> entry : chunkTiles.entrySet()) {
final BlockPos pos = entry.getKey();
final int lx = pos.getX() & 15;
final int ly = pos.getY();
final int lz = pos.getZ() & 15;
final int layer = ly >> 4;
if (!set.hasSection(layer)) {
continue;
}

int ordinal = set.getBlock(lx, ly, lz).getOrdinal();
if (ordinal != BlockTypesCache.ReservedIDs.__RESERVED__) {
BlockEntity tile = entry.getValue();
if (PaperLib.isPaper() && tile instanceof BeaconBlockEntity) {
if (beacons == null) {
beacons = new ArrayList<>();
}
beacons.add(tile);
PaperweightPlatformAdapter.removeBeacon(tile, nmsChunk);
List<BlockEntity> beacons = TaskManager.taskManager().sync(() -> {
// Remove existing tiles. Create a copy so that we can remove blocks
Map<BlockPos, BlockEntity> chunkTiles = new HashMap<>(nmsChunk.getBlockEntities());
List<BlockEntity> beaconEntities = null;
if (!chunkTiles.isEmpty()) {
for (Map.Entry<BlockPos, BlockEntity> entry : chunkTiles.entrySet()) {
final BlockPos pos = entry.getKey();
final int lx = pos.getX() & 15;
final int ly = pos.getY();
final int lz = pos.getZ() & 15;
final int layer = ly >> 4;
if (!set.hasSection(layer)) {
continue;
}
nmsChunk.removeBlockEntity(tile.getBlockPos());
if (createCopy) {
copy.storeTile(tile);

int ordinal = set.getBlock(lx, ly, lz).getOrdinal();
if (ordinal != BlockTypesCache.ReservedIDs.__RESERVED__) {
BlockEntity tile = entry.getValue();
if (PaperLib.isPaper() && tile instanceof BeaconBlockEntity) {
if (beaconEntities == null) {
beaconEntities = new ArrayList<>();
}
beaconEntities.add(tile);
PaperweightPlatformAdapter.removeBeacon(tile, nmsChunk);
continue;
}
nmsChunk.removeBlockEntity(tile.getBlockPos());
if (createCopy) {
copy.storeTile(tile);
}
}
}
}
}
return beaconEntities;
});
final BiomeType[][] biomes = set.getBiomes();

int bitMask = 0;
Expand Down
58 changes: 31 additions & 27 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 @@ -15,6 +15,7 @@
import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
import com.fastasyncworldedit.core.util.MathMan;
import com.fastasyncworldedit.core.util.NbtUtils;
import com.fastasyncworldedit.core.util.TaskManager;
import com.fastasyncworldedit.core.util.collection.AdaptedMap;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.BukkitEntity;
Expand Down Expand Up @@ -344,38 +345,41 @@ protected <T extends Future<T>> T internalCall(
}
copies.put(copyKey, copy);
}
// Remove existing tiles. Create a copy so that we can remove blocks
Map<BlockPos, BlockEntity> chunkTiles = new HashMap<>(nmsChunk.getBlockEntities());
List<BlockEntity> beacons = null;
if (!chunkTiles.isEmpty()) {
for (Map.Entry<BlockPos, BlockEntity> entry : chunkTiles.entrySet()) {
final BlockPos pos = entry.getKey();
final int lx = pos.getX() & 15;
final int ly = pos.getY();
final int lz = pos.getZ() & 15;
final int layer = ly >> 4;
if (!set.hasSection(layer)) {
continue;
}

int ordinal = set.getBlock(lx, ly, lz).getOrdinal();
if (ordinal != BlockTypesCache.ReservedIDs.__RESERVED__) {
BlockEntity tile = entry.getValue();
if (PaperLib.isPaper() && tile instanceof BeaconBlockEntity) {
if (beacons == null) {
beacons = new ArrayList<>();
}
beacons.add(tile);
PaperweightPlatformAdapter.removeBeacon(tile, nmsChunk);
List<BlockEntity> beacons = TaskManager.taskManager().sync(() -> {
// Remove existing tiles. Create a copy so that we can remove blocks
Map<BlockPos, BlockEntity> chunkTiles = new HashMap<>(nmsChunk.getBlockEntities());
List<BlockEntity> beaconEntities = null;
if (!chunkTiles.isEmpty()) {
for (Map.Entry<BlockPos, BlockEntity> entry : chunkTiles.entrySet()) {
final BlockPos pos = entry.getKey();
final int lx = pos.getX() & 15;
final int ly = pos.getY();
final int lz = pos.getZ() & 15;
final int layer = ly >> 4;
if (!set.hasSection(layer)) {
continue;
}
nmsChunk.removeBlockEntity(tile.getBlockPos());
if (createCopy) {
copy.storeTile(tile);

int ordinal = set.getBlock(lx, ly, lz).getOrdinal();
if (ordinal != BlockTypesCache.ReservedIDs.__RESERVED__) {
BlockEntity tile = entry.getValue();
if (PaperLib.isPaper() && tile instanceof BeaconBlockEntity) {
if (beaconEntities == null) {
beaconEntities = new ArrayList<>();
}
beaconEntities.add(tile);
PaperweightPlatformAdapter.removeBeacon(tile, nmsChunk);
continue;
}
nmsChunk.removeBlockEntity(tile.getBlockPos());
if (createCopy) {
copy.storeTile(tile);
}
}
}
}
}
return beaconEntities;
});
final BiomeType[][] biomes = set.getBiomes();

int bitMask = 0;
Expand Down
58 changes: 31 additions & 27 deletions .../main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_3/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.fastasyncworldedit.core.queue.IChunkSet;
import com.fastasyncworldedit.core.util.MathMan;
import com.fastasyncworldedit.core.util.NbtUtils;
import com.fastasyncworldedit.core.util.TaskManager;
import com.fastasyncworldedit.core.util.collection.AdaptedMap;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.BukkitEntity;
Expand Down Expand Up @@ -342,38 +343,41 @@ protected <T extends Future<T>> T internalCall(
}
copies.put(copyKey, copy);
}
// Remove existing tiles. Create a copy so that we can remove blocks
Map<BlockPos, BlockEntity> chunkTiles = new HashMap<>(nmsChunk.getBlockEntities());
List<BlockEntity> beacons = null;
if (!chunkTiles.isEmpty()) {
for (Map.Entry<BlockPos, BlockEntity> entry : chunkTiles.entrySet()) {
final BlockPos pos = entry.getKey();
final int lx = pos.getX() & 15;
final int ly = pos.getY();
final int lz = pos.getZ() & 15;
final int layer = ly >> 4;
if (!set.hasSection(layer)) {
continue;
}

int ordinal = set.getBlock(lx, ly, lz).getOrdinal();
if (ordinal != BlockTypesCache.ReservedIDs.__RESERVED__) {
BlockEntity tile = entry.getValue();
if (PaperLib.isPaper() && tile instanceof BeaconBlockEntity) {
if (beacons == null) {
beacons = new ArrayList<>();
}
beacons.add(tile);
PaperweightPlatformAdapter.removeBeacon(tile, nmsChunk);
List<BlockEntity> beacons = TaskManager.taskManager().sync(() -> {
// Remove existing tiles. Create a copy so that we can remove blocks
Map<BlockPos, BlockEntity> chunkTiles = new HashMap<>(nmsChunk.getBlockEntities());
List<BlockEntity> beaconEntities = null;
if (!chunkTiles.isEmpty()) {
for (Map.Entry<BlockPos, BlockEntity> entry : chunkTiles.entrySet()) {
final BlockPos pos = entry.getKey();
final int lx = pos.getX() & 15;
final int ly = pos.getY();
final int lz = pos.getZ() & 15;
final int layer = ly >> 4;
if (!set.hasSection(layer)) {
continue;
}
nmsChunk.removeBlockEntity(tile.getBlockPos());
if (createCopy) {
copy.storeTile(tile);

int ordinal = set.getBlock(lx, ly, lz).getOrdinal();
if (ordinal != BlockTypesCache.ReservedIDs.__RESERVED__) {
BlockEntity tile = entry.getValue();
if (PaperLib.isPaper() && tile instanceof BeaconBlockEntity) {
if (beaconEntities == null) {
beaconEntities = new ArrayList<>();
}
beaconEntities.add(tile);
PaperweightPlatformAdapter.removeBeacon(tile, nmsChunk);
continue;
}
nmsChunk.removeBlockEntity(tile.getBlockPos());
if (createCopy) {
copy.storeTile(tile);
}
}
}
}
}
return beaconEntities;
});
final BiomeType[][] biomes = set.getBiomes();

int bitMask = 0;
Expand Down
Loading
Loading