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

Fixed NPE errors when loading chunk loaders after deleting player data

Browse Source
This commit is contained in:
OmerBenGera 2023-04-11 20:54:16 +03:00
parent 7da9f07005
commit ddb36f8d28
10 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NMS/v117/src/main/java/com/bgsoftware/wildloaders/nms/v117/loader/ChunkLoaderBlockEntity.java
View File

@ -18,6 +18,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader {
@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
} }
private void updateName(EntityHologram hologram, String line) { private void updateName(EntityHologram hologram, String line) {
assert chunkLoader.getWhoPlaced().getName() != null; String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse("");
hologram.setHologramName(line hologram.setHologramName(line
.replace("{0}", chunkLoader.getWhoPlaced().getName()) .replace("{0}", placerName)
.replace("{1}", daysAmount + "") .replace("{1}", daysAmount + "")
.replace("{2}", hoursAmount + "") .replace("{2}", hoursAmount + "")
.replace("{3}", minutesAmount + "") .replace("{3}", minutesAmount + "")

5
NMS/v1182/src/main/java/com/bgsoftware/wildloaders/nms/v1182/loader/ChunkLoaderBlockEntity.java
View File

@ -18,6 +18,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader {
@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
} }
private void updateName(EntityHologram hologram, String line) { private void updateName(EntityHologram hologram, String line) {
assert chunkLoader.getWhoPlaced().getName() != null; String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse("");
hologram.setHologramName(line hologram.setHologramName(line
.replace("{0}", chunkLoader.getWhoPlaced().getName()) .replace("{0}", placerName)
.replace("{1}", daysAmount + "") .replace("{1}", daysAmount + "")
.replace("{2}", hoursAmount + "") .replace("{2}", hoursAmount + "")
.replace("{3}", minutesAmount + "") .replace("{3}", minutesAmount + "")

5
NMS/v119/src/main/java/com/bgsoftware/wildloaders/nms/v119/loader/ChunkLoaderBlockEntity.java
View File

@ -18,6 +18,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader {
@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
} }
private void updateName(EntityHologram hologram, String line) { private void updateName(EntityHologram hologram, String line) {
assert chunkLoader.getWhoPlaced().getName() != null; String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse("");
hologram.setHologramName(line hologram.setHologramName(line
.replace("{0}", chunkLoader.getWhoPlaced().getName()) .replace("{0}", placerName)
.replace("{1}", daysAmount + "") .replace("{1}", daysAmount + "")
.replace("{2}", hoursAmount + "") .replace("{2}", hoursAmount + "")
.replace("{3}", minutesAmount + "") .replace("{3}", minutesAmount + "")

5
NMS/v1191/src/main/java/com/bgsoftware/wildloaders/nms/v1191/loader/ChunkLoaderBlockEntity.java
View File

@ -18,6 +18,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader {
@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
} }
private void updateName(EntityHologram hologram, String line) { private void updateName(EntityHologram hologram, String line) {
assert chunkLoader.getWhoPlaced().getName() != null; String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse("");
hologram.setHologramName(line hologram.setHologramName(line
.replace("{0}", chunkLoader.getWhoPlaced().getName()) .replace("{0}", placerName)
.replace("{1}", daysAmount + "") .replace("{1}", daysAmount + "")
.replace("{2}", hoursAmount + "") .replace("{2}", hoursAmount + "")
.replace("{3}", minutesAmount + "") .replace("{3}", minutesAmount + "")

5
NMS/v1192/src/main/java/com/bgsoftware/wildloaders/nms/v1192/loader/ChunkLoaderBlockEntity.java
View File

@ -18,6 +18,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader {
@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
} }
private void updateName(EntityHologram hologram, String line) { private void updateName(EntityHologram hologram, String line) {
assert chunkLoader.getWhoPlaced().getName() != null; String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse("");
hologram.setHologramName(line hologram.setHologramName(line
.replace("{0}", chunkLoader.getWhoPlaced().getName()) .replace("{0}", placerName)
.replace("{1}", daysAmount + "") .replace("{1}", daysAmount + "")
.replace("{2}", hoursAmount + "") .replace("{2}", hoursAmount + "")
.replace("{3}", minutesAmount + "") .replace("{3}", minutesAmount + "")

5
NMS/v1193/src/main/java/com/bgsoftware/wildloaders/nms/v1193/loader/ChunkLoaderBlockEntity.java
View File

@ -18,6 +18,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader {
@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
} }
private void updateName(EntityHologram hologram, String line) { private void updateName(EntityHologram hologram, String line) {
assert chunkLoader.getWhoPlaced().getName() != null; String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse("");
hologram.setHologramName(line hologram.setHologramName(line
.replace("{0}", chunkLoader.getWhoPlaced().getName()) .replace("{0}", placerName)
.replace("{1}", daysAmount + "") .replace("{1}", daysAmount + "")
.replace("{2}", hoursAmount + "") .replace("{2}", hoursAmount + "")
.replace("{3}", minutesAmount + "") .replace("{3}", minutesAmount + "")

5
NMS/v1194/src/main/java/com/bgsoftware/wildloaders/nms/v1194/loader/ChunkLoaderBlockEntity.java
View File

@ -18,6 +18,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader { public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEntityChunkLoader {
@ -132,9 +133,9 @@ public final class ChunkLoaderBlockEntity extends BlockEntity implements ITileEn
} }
private void updateName(EntityHologram hologram, String line) { private void updateName(EntityHologram hologram, String line) {
assert chunkLoader.getWhoPlaced().getName() != null; String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse("");
hologram.setHologramName(line hologram.setHologramName(line
.replace("{0}", chunkLoader.getWhoPlaced().getName()) .replace("{0}", placerName)
.replace("{1}", daysAmount + "") .replace("{1}", daysAmount + "")
.replace("{2}", hoursAmount + "") .replace("{2}", hoursAmount + "")
.replace("{3}", minutesAmount + "") .replace("{3}", minutesAmount + "")

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

@ -18,6 +18,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public final class TileEntityChunkLoader extends TileEntity implements ITickable, ITileEntityChunkLoader { public final class TileEntityChunkLoader extends TileEntity implements ITickable, ITileEntityChunkLoader {
@ -116,8 +117,9 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable
} }
private void updateName(EntityHolograms hologram, String line) { private void updateName(EntityHolograms hologram, String line) {
String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse("");
hologram.setHologramName(line hologram.setHologramName(line
.replace("{0}", chunkLoader.getWhoPlaced().getName()) .replace("{0}", placerName)
.replace("{1}", daysAmount + "") .replace("{1}", daysAmount + "")
.replace("{2}", hoursAmount + "") .replace("{2}", hoursAmount + "")
.replace("{3}", minutesAmount + "") .replace("{3}", minutesAmount + "")

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

@ -19,6 +19,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public final class TileEntityChunkLoader extends TileEntity implements ITickable, ITileEntityChunkLoader { public final class TileEntityChunkLoader extends TileEntity implements ITickable, ITileEntityChunkLoader {
@ -130,9 +131,9 @@ public final class TileEntityChunkLoader extends TileEntity implements ITickable
} }
private void updateName(EntityHolograms hologram, String line) { private void updateName(EntityHolograms hologram, String line) {
assert chunkLoader.getWhoPlaced().getName() != null; String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse("");
hologram.setHologramName(line hologram.setHologramName(line
.replace("{0}", chunkLoader.getWhoPlaced().getName()) .replace("{0}", placerName)
.replace("{1}", daysAmount + "") .replace("{1}", daysAmount + "")
.replace("{2}", hoursAmount + "") .replace("{2}", hoursAmount + "")
.replace("{3}", minutesAmount + "") .replace("{3}", minutesAmount + "")

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

@ -18,6 +18,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
public final class TileEntityChunkLoader extends TileEntity implements IUpdatePlayerListBox, ITileEntityChunkLoader { public final class TileEntityChunkLoader extends TileEntity implements IUpdatePlayerListBox, ITileEntityChunkLoader {
@ -116,8 +117,9 @@ public final class TileEntityChunkLoader extends TileEntity implements IUpdatePl
} }
private void updateName(EntityHolograms hologram, String line) { private void updateName(EntityHolograms hologram, String line) {
String placerName = Optional.ofNullable(chunkLoader.getWhoPlaced().getName()).orElse("");
hologram.setHologramName(line hologram.setHologramName(line
.replace("{0}", chunkLoader.getWhoPlaced().getName()) .replace("{0}", placerName)
.replace("{1}", daysAmount + "") .replace("{1}", daysAmount + "")
.replace("{2}", hoursAmount + "") .replace("{2}", hoursAmount + "")
.replace("{3}", minutesAmount + "") .replace("{3}", minutesAmount + "")