Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

make passenger list not null because its more clean to use the api that way

Browse source
This commit is contained in:
Pyrbu 2024-12-15 10:40:28 +01:00
parent ca89bfe32d
commit 9477d4b500
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugin/src/main/java/lol/pyr/znpcsplus/entity/PacketEntity.java
View file

@ -13,11 +13,7 @@ import lol.pyr.znpcsplus.util.Viewable;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.stream.IntStream;
public class PacketEntity implements PropertyHolder { public class PacketEntity implements PropertyHolder {
private final PacketFactory packetFactory; private final PacketFactory packetFactory;
@ -75,8 +71,8 @@ public class PacketEntity implements PropertyHolder {
if (vehicleId != null) { if (vehicleId != null) {
packetFactory.setPassengers(player, vehicleId, this.getEntityId()); packetFactory.setPassengers(player, vehicleId, this.getEntityId());
} }
if(passengers != null) { if (passengers != null) {
packetFactory.setPassengers(player, this.getEntityId(), passengers.stream().mapToInt(Integer::intValue).toArray()); packetFactory.setPassengers(player, this.getEntityId(), passengers.stream().mapToInt(Integer::intValue).toArray());
} }
} }
@ -108,7 +104,7 @@ public class PacketEntity implements PropertyHolder {
if (vehicleId == null) return; if (vehicleId == null) return;
for (Player player : viewable.getViewers()) { for (Player player : viewable.getViewers()) {
packetFactory.setPassengers(player, this.getEntityId(), vehicleId); packetFactory.setPassengers(player, this.getEntityId(), vehicleId);
} }
} }
@ -141,7 +137,7 @@ public class PacketEntity implements PropertyHolder {
} }
public List<Integer> getPassengers() { public List<Integer> getPassengers() {
return passengers; return passengers == null ? Collections.emptyList() : passengers;
} }
public void addPassenger(int entityId) { public void addPassenger(int entityId) {
@ -150,7 +146,7 @@ public class PacketEntity implements PropertyHolder {
} }
passengers.add(entityId); passengers.add(entityId);
for (Player player : viewable.getViewers()) { for (Player player : viewable.getViewers()) {
packetFactory.setPassengers(player, this.getEntityId(), passengers.stream().mapToInt(Integer::intValue).toArray()); packetFactory.setPassengers(player, this.getEntityId(), passengers.stream().mapToInt(Integer::intValue).toArray());
} }
} }
@ -158,7 +154,7 @@ public class PacketEntity implements PropertyHolder {
if (passengers == null) return; if (passengers == null) return;
passengers.remove(entityId); passengers.remove(entityId);
for (Player player : viewable.getViewers()) { for (Player player : viewable.getViewers()) {
packetFactory.setPassengers(player, this.getEntityId(), passengers.stream().mapToInt(Integer::intValue).toArray()); packetFactory.setPassengers(player, this.getEntityId(), passengers.stream().mapToInt(Integer::intValue).toArray());
} }
if (passengers.isEmpty()) { if (passengers.isEmpty()) {
passengers = null; passengers = null;

5
plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java
View file

@ -20,6 +20,7 @@ import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.*; import java.util.*;
@ -248,7 +249,7 @@ public class NpcImpl extends Viewable implements Npc {
} }
@Override @Override
public @Nullable List<Integer> getPassengers() { public @NotNull List<Integer> getPassengers() {
return entity.getPassengers(); return entity.getPassengers();
} }
@ -271,6 +272,4 @@ public class NpcImpl extends Viewable implements Npc {
public void setVehicleId(Integer vehicleId) { public void setVehicleId(Integer vehicleId) {
entity.setVehicleId(vehicleId); entity.setVehicleId(vehicleId);
} }
} }