Upstream/WildLoaders
1
0
Fork 0
mirror of https://github.com/BG-Software-LLC/WildLoaders.git synced 2024-11-21 11:46:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a NPE when placing a chunk loader (#77)

Browse Source
This commit is contained in:
OmerBenGera 2024-03-30 16:41:26 +03:00
parent 901f630d89
commit a07499aa66
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NMS/v1_12_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_12_R1/loader/TileEntityChunkLoader.java
View File

@ -41,6 +41,8 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable
loaderBlock = world.getType(blockPosition).getBlock(); loaderBlock = world.getType(blockPosition).getBlock();
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
if (!this.chunkLoader.isInfinite()) { if (!this.chunkLoader.isInfinite()) {
long timeLeft = chunkLoader.getTimeLeft(); long timeLeft = chunkLoader.getTimeLeft();
@ -68,8 +70,6 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable
currentY += 0.23; currentY += 0.23;
holograms.add(hologram); holograms.add(hologram);
} }
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
} }
@Override @Override

4
NMS/v1_16_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_16_R3/loader/TileEntityChunkLoader.java
View File

@ -49,6 +49,8 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable
} catch (Throwable ignored) { } catch (Throwable ignored) {
} }
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
if (!this.chunkLoader.isInfinite()) { if (!this.chunkLoader.isInfinite()) {
long timeLeft = chunkLoader.getTimeLeft(); long timeLeft = chunkLoader.getTimeLeft();
@ -76,8 +78,6 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable
currentY += 0.23; currentY += 0.23;
holograms.add(hologram); holograms.add(hologram);
} }
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
} }
@Override @Override

4
NMS/v1_17/src/main/java/com/bgsoftware/wildloaders/nms/v1_17/loader/ChunkLoaderBlockEntity.java
View File

@ -48,6 +48,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
loaderBlock = serverLevel.getBlockState(blockPos).getBlock(); loaderBlock = serverLevel.getBlockState(blockPos).getBlock();
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
if (!this.chunkLoader.isInfinite()) { if (!this.chunkLoader.isInfinite()) {
long timeLeft = chunkLoader.getTimeLeft(); long timeLeft = chunkLoader.getTimeLeft();
@ -76,8 +78,6 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
currentY += 0.23; currentY += 0.23;
holograms.add(hologram); holograms.add(hologram);
} }
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
} }
public void tick() { public void tick() {

4
NMS/v1_18/src/main/java/com/bgsoftware/wildloaders/nms/v1_18/loader/ChunkLoaderBlockEntity.java
View File

@ -48,6 +48,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
loaderBlock = serverLevel.getBlockState(blockPos).getBlock(); loaderBlock = serverLevel.getBlockState(blockPos).getBlock();
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
if (!this.chunkLoader.isInfinite()) { if (!this.chunkLoader.isInfinite()) {
long timeLeft = chunkLoader.getTimeLeft(); long timeLeft = chunkLoader.getTimeLeft();
@ -76,8 +78,6 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
currentY += 0.23; currentY += 0.23;
holograms.add(hologram); holograms.add(hologram);
} }
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
} }
public void tick() { public void tick() {

4
NMS/v1_19/src/main/java/com/bgsoftware/wildloaders/nms/v1_19/loader/ChunkLoaderBlockEntity.java
View File

@ -48,6 +48,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
loaderBlock = serverLevel.getBlockState(blockPos).getBlock(); loaderBlock = serverLevel.getBlockState(blockPos).getBlock();
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
if (!this.chunkLoader.isInfinite()) { if (!this.chunkLoader.isInfinite()) {
long timeLeft = chunkLoader.getTimeLeft(); long timeLeft = chunkLoader.getTimeLeft();
@ -76,8 +78,6 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
currentY += 0.23; currentY += 0.23;
holograms.add(hologram); holograms.add(hologram);
} }
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
} }
public void tick() { public void tick() {

4
NMS/v1_20_1/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_1/loader/ChunkLoaderBlockEntity.java
View File

@ -48,6 +48,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
loaderBlock = serverLevel.getBlockState(blockPos).getBlock(); loaderBlock = serverLevel.getBlockState(blockPos).getBlock();
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
if (!this.chunkLoader.isInfinite()) { if (!this.chunkLoader.isInfinite()) {
long timeLeft = chunkLoader.getTimeLeft(); long timeLeft = chunkLoader.getTimeLeft();
@ -76,8 +78,6 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
currentY += 0.23; currentY += 0.23;
holograms.add(hologram); holograms.add(hologram);
} }
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
} }
public void tick() { public void tick() {

4
NMS/v1_20_2/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_2/loader/ChunkLoaderBlockEntity.java
View File

@ -48,6 +48,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
loaderBlock = serverLevel.getBlockState(blockPos).getBlock(); loaderBlock = serverLevel.getBlockState(blockPos).getBlock();
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
if (!this.chunkLoader.isInfinite()) { if (!this.chunkLoader.isInfinite()) {
long timeLeft = chunkLoader.getTimeLeft(); long timeLeft = chunkLoader.getTimeLeft();
@ -76,8 +78,6 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
currentY += 0.23; currentY += 0.23;
holograms.add(hologram); holograms.add(hologram);
} }
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
} }
public void tick() { public void tick() {

4
NMS/v1_20_3/src/main/java/com/bgsoftware/wildloaders/nms/v1_20_3/loader/ChunkLoaderBlockEntity.java
View File

@ -48,6 +48,8 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
loaderBlock = serverLevel.getBlockState(blockPos).getBlock(); loaderBlock = serverLevel.getBlockState(blockPos).getBlock();
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
if (!this.chunkLoader.isInfinite()) { if (!this.chunkLoader.isInfinite()) {
long timeLeft = chunkLoader.getTimeLeft(); long timeLeft = chunkLoader.getTimeLeft();
@ -76,8 +78,6 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
currentY += 0.23; currentY += 0.23;
holograms.add(hologram); holograms.add(hologram);
} }
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
} }
public void tick() { public void tick() {

4
NMS/v1_8_R3/src/main/java/com/bgsoftware/wildloaders/nms/v1_8_R3/loader/TileEntityChunkLoader.java
View File

@ -41,6 +41,8 @@ public final class TileEntityChunkLoader extends TileEntity implements IUpdatePl
loaderBlock = world.getType(blockPosition).getBlock(); loaderBlock = world.getType(blockPosition).getBlock();
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
if (!this.chunkLoader.isInfinite()) { if (!this.chunkLoader.isInfinite()) {
long timeLeft = chunkLoader.getTimeLeft(); long timeLeft = chunkLoader.getTimeLeft();
@ -68,8 +70,6 @@ public final class TileEntityChunkLoader extends TileEntity implements IUpdatePl
currentY += 0.23; currentY += 0.23;
holograms.add(hologram); holograms.add(hologram);
} }
this.cachedPlacerName = Optional.ofNullable(this.chunkLoader.getWhoPlaced().getName()).orElse("");
} }
@Override @Override