Skip to content

Fix NPE on tile entity copy #53

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

Merged
R00tB33rMan merged 1 commit into from
Jan 29, 2026
Merged

Fix NPE on tile entity copy #53

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
29 changes: 17 additions & 12 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 @@ -197,23 +197,28 @@ public void removeSectionLighting(int layer, boolean sky) {

@Override
public FaweCompoundTag tile(final int x, final int y, final int z) {
BlockEntity blockEntity = getChunk().getBlockEntity(new BlockPos((x & 15) + (
chunkX << 4), y, (z & 15) + (
chunkZ << 4)));
if (blockEntity == null) {
return null;
}
return NMS_TO_TILE.apply(blockEntity);
LevelChunk chunk = getChunk();
if (chunk == null) return null;

BlockPos pos = new BlockPos((x & 15) + (chunkX << 4), y, (z & 15) + (chunkZ << 4));
Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null) return null;

BlockEntity blockEntity = tiles.get(pos);
if (blockEntity == null) return null;

return NMS_TO_TILE.apply(blockEntity);
}

@Override
public Map<BlockVector3, FaweCompoundTag> tiles() {
Map<BlockPos, BlockEntity> nmsTiles = getChunk().getBlockEntities();
if (nmsTiles.isEmpty()) {
return Collections.emptyMap();
}
return AdaptedMap.immutable(nmsTiles, posNms2We, NMS_TO_TILE);
LevelChunk chunk = getChunk();
if (chunk == null) return Collections.emptyMap();

Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null || tiles.isEmpty()) return Collections.emptyMap();

return AdaptedMap.immutable(tiles, posNms2We, NMS_TO_TILE);
}

@Override
Expand Down
29 changes: 17 additions & 12 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 @@ -197,23 +197,28 @@ public void removeSectionLighting(int layer, boolean sky) {

@Override
public FaweCompoundTag tile(final int x, final int y, final int z) {
BlockEntity blockEntity = getChunk().getBlockEntity(new BlockPos((x & 15) + (
chunkX << 4), y, (z & 15) + (
chunkZ << 4)));
if (blockEntity == null) {
return null;
}
return NMS_TO_TILE.apply(blockEntity);
LevelChunk chunk = getChunk();
if (chunk == null) return null;

BlockPos pos = new BlockPos((x & 15) + (chunkX << 4), y, (z & 15) + (chunkZ << 4));
Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null) return null;

BlockEntity blockEntity = tiles.get(pos);
if (blockEntity == null) return null;

return NMS_TO_TILE.apply(blockEntity);
}

@Override
public Map<BlockVector3, FaweCompoundTag> tiles() {
Map<BlockPos, BlockEntity> nmsTiles = getChunk().getBlockEntities();
if (nmsTiles.isEmpty()) {
return Collections.emptyMap();
}
return AdaptedMap.immutable(nmsTiles, posNms2We, NMS_TO_TILE);
LevelChunk chunk = getChunk();
if (chunk == null) return Collections.emptyMap();

Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null || tiles.isEmpty()) return Collections.emptyMap();

return AdaptedMap.immutable(tiles, posNms2We, NMS_TO_TILE);
}

@Override
Expand Down
29 changes: 17 additions & 12 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 @@ -198,23 +198,28 @@ public void removeSectionLighting(int layer, boolean sky) {

@Override
public FaweCompoundTag tile(final int x, final int y, final int z) {
BlockEntity blockEntity = getChunk().getBlockEntity(new BlockPos((x & 15) + (
chunkX << 4), y, (z & 15) + (
chunkZ << 4)));
if (blockEntity == null) {
return null;
}
return NMS_TO_TILE.apply(blockEntity);
LevelChunk chunk = getChunk();
if (chunk == null) return null;

BlockPos pos = new BlockPos((x & 15) + (chunkX << 4), y, (z & 15) + (chunkZ << 4));
Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null) return null;

BlockEntity blockEntity = tiles.get(pos);
if (blockEntity == null) return null;

return NMS_TO_TILE.apply(blockEntity);
}

@Override
public Map<BlockVector3, FaweCompoundTag> tiles() {
Map<BlockPos, BlockEntity> nmsTiles = getChunk().getBlockEntities();
if (nmsTiles.isEmpty()) {
return Collections.emptyMap();
}
return AdaptedMap.immutable(nmsTiles, posNms2We, NMS_TO_TILE);
LevelChunk chunk = getChunk();
if (chunk == null) return Collections.emptyMap();

Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null || tiles.isEmpty()) return Collections.emptyMap();

return AdaptedMap.immutable(tiles, posNms2We, NMS_TO_TILE);
}

@Override
Expand Down
29 changes: 17 additions & 12 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 @@ -198,23 +198,28 @@ public void removeSectionLighting(int layer, boolean sky) {

@Override
public FaweCompoundTag tile(final int x, final int y, final int z) {
BlockEntity blockEntity = getChunk().getBlockEntity(new BlockPos((x & 15) + (
chunkX << 4), y, (z & 15) + (
chunkZ << 4)));
if (blockEntity == null) {
return null;
}
return NMS_TO_TILE.apply(blockEntity);
LevelChunk chunk = getChunk();
if (chunk == null) return null;

BlockPos pos = new BlockPos((x & 15) + (chunkX << 4), y, (z & 15) + (chunkZ << 4));
Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null) return null;

BlockEntity blockEntity = tiles.get(pos);
if (blockEntity == null) return null;

return NMS_TO_TILE.apply(blockEntity);
}

@Override
public Map<BlockVector3, FaweCompoundTag> tiles() {
Map<BlockPos, BlockEntity> nmsTiles = getChunk().getBlockEntities();
if (nmsTiles.isEmpty()) {
return Collections.emptyMap();
}
return AdaptedMap.immutable(nmsTiles, posNms2We, NMS_TO_TILE);
LevelChunk chunk = getChunk();
if (chunk == null) return Collections.emptyMap();

Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null || tiles.isEmpty()) return Collections.emptyMap();

return AdaptedMap.immutable(tiles, posNms2We, NMS_TO_TILE);
}

@Override
Expand Down
29 changes: 17 additions & 12 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_11/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,23 +198,28 @@ public void removeSectionLighting(int layer, boolean sky) {

@Override
public FaweCompoundTag tile(final int x, final int y, final int z) {
BlockEntity blockEntity = getChunk().getBlockEntity(new BlockPos((x & 15) + (
chunkX << 4), y, (z & 15) + (
chunkZ << 4)));
if (blockEntity == null) {
return null;
}
return NMS_TO_TILE.apply(blockEntity);
LevelChunk chunk = getChunk();
if (chunk == null) return null;

BlockPos pos = new BlockPos((x & 15) + (chunkX << 4), y, (z & 15) + (chunkZ << 4));
Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null) return null;

BlockEntity blockEntity = tiles.get(pos);
if (blockEntity == null) return null;

return NMS_TO_TILE.apply(blockEntity);
}

@Override
public Map<BlockVector3, FaweCompoundTag> tiles() {
Map<BlockPos, BlockEntity> nmsTiles = getChunk().getBlockEntities();
if (nmsTiles.isEmpty()) {
return Collections.emptyMap();
}
return AdaptedMap.immutable(nmsTiles, posNms2We, NMS_TO_TILE);
LevelChunk chunk = getChunk();
if (chunk == null) return Collections.emptyMap();

Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null || tiles.isEmpty()) return Collections.emptyMap();

return AdaptedMap.immutable(tiles, posNms2We, NMS_TO_TILE);
}

@Override
Expand Down
29 changes: 17 additions & 12 deletions .../main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_4/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,23 +199,28 @@ public void removeSectionLighting(int layer, boolean sky) {

@Override
public FaweCompoundTag tile(final int x, final int y, final int z) {
BlockEntity blockEntity = getChunk().getBlockEntity(new BlockPos((x & 15) + (
chunkX << 4), y, (z & 15) + (
chunkZ << 4)));
if (blockEntity == null) {
return null;
}
return NMS_TO_TILE.apply(blockEntity);
LevelChunk chunk = getChunk();
if (chunk == null) return null;

BlockPos pos = new BlockPos((x & 15) + (chunkX << 4), y, (z & 15) + (chunkZ << 4));
Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null) return null;

BlockEntity blockEntity = tiles.get(pos);
if (blockEntity == null) return null;

return NMS_TO_TILE.apply(blockEntity);
}

@Override
public Map<BlockVector3, FaweCompoundTag> tiles() {
Map<BlockPos, BlockEntity> nmsTiles = getChunk().getBlockEntities();
if (nmsTiles.isEmpty()) {
return Collections.emptyMap();
}
return AdaptedMap.immutable(nmsTiles, posNms2We, NMS_TO_TILE);
LevelChunk chunk = getChunk();
if (chunk == null) return Collections.emptyMap();

Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null || tiles.isEmpty()) return Collections.emptyMap();

return AdaptedMap.immutable(tiles, posNms2We, NMS_TO_TILE);
}

@Override
Expand Down
29 changes: 17 additions & 12 deletions .../main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_5/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,23 +199,28 @@ public void removeSectionLighting(int layer, boolean sky) {

@Override
public FaweCompoundTag tile(final int x, final int y, final int z) {
BlockEntity blockEntity = getChunk().getBlockEntity(new BlockPos((x & 15) + (
chunkX << 4), y, (z & 15) + (
chunkZ << 4)));
if (blockEntity == null) {
return null;
}
return NMS_TO_TILE.apply(blockEntity);
LevelChunk chunk = getChunk();
if (chunk == null) return null;

BlockPos pos = new BlockPos((x & 15) + (chunkX << 4), y, (z & 15) + (chunkZ << 4));
Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null) return null;

BlockEntity blockEntity = tiles.get(pos);
if (blockEntity == null) return null;

return NMS_TO_TILE.apply(blockEntity);
}

@Override
public Map<BlockVector3, FaweCompoundTag> tiles() {
Map<BlockPos, BlockEntity> nmsTiles = getChunk().getBlockEntities();
if (nmsTiles.isEmpty()) {
return Collections.emptyMap();
}
return AdaptedMap.immutable(nmsTiles, posNms2We, NMS_TO_TILE);
LevelChunk chunk = getChunk();
if (chunk == null) return Collections.emptyMap();

Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null || tiles.isEmpty()) return Collections.emptyMap();

return AdaptedMap.immutable(tiles, posNms2We, NMS_TO_TILE);
}

@Override
Expand Down
29 changes: 17 additions & 12 deletions .../main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_6/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,23 +202,28 @@ public void removeSectionLighting(int layer, boolean sky) {

@Override
public FaweCompoundTag tile(final int x, final int y, final int z) {
BlockEntity blockEntity = getChunk().getBlockEntity(new BlockPos((x & 15) + (
chunkX << 4), y, (z & 15) + (
chunkZ << 4)));
if (blockEntity == null) {
return null;
}
return NMS_TO_TILE.apply(blockEntity);
LevelChunk chunk = getChunk();
if (chunk == null) return null;

BlockPos pos = new BlockPos((x & 15) + (chunkX << 4), y, (z & 15) + (chunkZ << 4));
Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null) return null;

BlockEntity blockEntity = tiles.get(pos);
if (blockEntity == null) return null;

return NMS_TO_TILE.apply(blockEntity);
}

@Override
public Map<BlockVector3, FaweCompoundTag> tiles() {
Map<BlockPos, BlockEntity> nmsTiles = getChunk().getBlockEntities();
if (nmsTiles.isEmpty()) {
return Collections.emptyMap();
}
return AdaptedMap.immutable(nmsTiles, posNms2We, NMS_TO_TILE);
LevelChunk chunk = getChunk();
if (chunk == null) return Collections.emptyMap();

Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null || tiles.isEmpty()) return Collections.emptyMap();

return AdaptedMap.immutable(tiles, posNms2We, NMS_TO_TILE);
}

@Override
Expand Down
29 changes: 17 additions & 12 deletions .../main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_9/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,23 +202,28 @@ public void removeSectionLighting(int layer, boolean sky) {

@Override
public FaweCompoundTag tile(final int x, final int y, final int z) {
BlockEntity blockEntity = getChunk().getBlockEntity(new BlockPos((x & 15) + (
chunkX << 4), y, (z & 15) + (
chunkZ << 4)));
if (blockEntity == null) {
return null;
}
return NMS_TO_TILE.apply(blockEntity);
LevelChunk chunk = getChunk();
if (chunk == null) return null;

BlockPos pos = new BlockPos((x & 15) + (chunkX << 4), y, (z & 15) + (chunkZ << 4));
Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null) return null;

BlockEntity blockEntity = tiles.get(pos);
if (blockEntity == null) return null;

return NMS_TO_TILE.apply(blockEntity);
}

@Override
public Map<BlockVector3, FaweCompoundTag> tiles() {
Map<BlockPos, BlockEntity> nmsTiles = getChunk().getBlockEntities();
if (nmsTiles.isEmpty()) {
return Collections.emptyMap();
}
return AdaptedMap.immutable(nmsTiles, posNms2We, NMS_TO_TILE);
LevelChunk chunk = getChunk();
if (chunk == null) return Collections.emptyMap();

Map<BlockPos, BlockEntity> tiles = chunk.getBlockEntities();
if (tiles == null || tiles.isEmpty()) return Collections.emptyMap();

return AdaptedMap.immutable(tiles, posNms2We, NMS_TO_TILE);
}

@Override
Expand Down
Loading