Jona123
/
NPCLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6 from JitseB/dev 

Dev branche merge.
This commit is contained in:
Jitse Boonstra 2018-04-25 15:55:55 +02:00 committed by GitHub
parent 6fa94ca244 65234425fc
commit ad4002f2ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/net/jitse/npclib/listeners/PacketListener.java
View File

@ -39,7 +39,6 @@ public class PacketListener {
@Override
public Object onPacketInAsync(Player player, Channel channel, Object packet) {
if (packetPlayInUseEntityClazz.isInstance(packet)) {
NPC npc = NPCManager.getAllNPCs().stream().filter(
check -> check.isActuallyShown(player) && check.getEntityId() == (int) entityIdField.get(packet))

18
src/net/jitse/npclib/listeners/PlayerListener.java
View File

@ -14,29 +14,13 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerChangedWorldEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
/**
* @author Jitse Boonstra
*/
public class PlayerListener implements Listener {
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event) {
Player player = event.getPlayer();
for (NPC npc : NPCManager.getAllNPCs()) {
if (npc.getAutoHidden().contains(player.getUniqueId())) {
npc.getAutoHidden().remove(player.getUniqueId());
}
// Don't need to use NPC#hide since the entity is not registered in the NMS server.
if (npc.getShown().contains(player.getUniqueId())) {
npc.getShown().remove(player.getUniqueId());
}
}
}
@EventHandler
public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
Player player = event.getPlayer();

32
src/net/jitse/npclib/listeners/player/PlayerQuitListener.java Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2018 Jitse Boonstra
*/
package net.jitse.npclib.listeners.player;
import net.jitse.npclib.NPCManager;
import net.jitse.npclib.api.NPC;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent;
/**
* @author Jitse Boonstra
*/
public class PlayerQuitListener implements Listener {
@EventHandler
public void onPlayerQuit(PlayerQuitEvent event) {
Player player = event.getPlayer();
for (NPC npc : NPCManager.getAllNPCs()) {
if (npc.getAutoHidden().contains(player.getUniqueId())) {
npc.getAutoHidden().remove(player.getUniqueId());
}
if (npc.isActuallyShown(player)) {
npc.hide(player);
}
}
}
}

4
src/net/jitse/npclib/nms/v1_12_R1/NPC_V1_12_R1.java
View File

@ -82,9 +82,9 @@ public class NPC_V1_12_R1 extends NPC {
hologram.spawn(player);
// Todo: Test this new delay speed (custom skin render issue).
Bukkit.getScheduler().runTaskLater(plugin, () ->
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 5);
playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 10);
}
@Override

13
src/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutEntityTeleportWrapper.java Normal file
View File

@ -0,0 +1,13 @@
/*
* Copyright (c) 2018 Jitse Boonstra
*/
package net.jitse.npclib.nms.v1_12_R1.packets;
/**
* @author Jitse Boonstra
*/
public class PacketPlayOutEntityTeleportWrapper {
}