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

upstream #1

Closed
bridge wants to merge 65 commits from feat/upstream into 2.X
pull from: feat/upstream
merge into: Netherite-Public:2.X
Conversation 0 Commits 65 Files changed 60 +9 -14
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit aa5e62ab0d - Show all commits

10
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,7 +71,7 @@ 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());
} }
} }
@ -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) {

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);
} }
} }