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

Moved some methods and classes.

This commit is contained in:
JitseB 2018-04-25 15:59:37 +02:00
parent ad4002f2ff
commit d84a7dfc11
5 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/net/jitse/npclib/NPCLib.java
View File

@ -5,9 +5,11 @@
package net.jitse.npclib;
import net.jitse.npclib.api.NPC;
import net.jitse.npclib.listeners.ChunkListener;
import net.jitse.npclib.listeners.PacketListener;
import net.jitse.npclib.listeners.PlayerListener;
import net.jitse.npclib.listeners.packet.PacketListener;
import net.jitse.npclib.listeners.player.PlayerChangedWorldListener;
import net.jitse.npclib.listeners.player.PlayerMoveOrTeleportListener;
import net.jitse.npclib.listeners.player.PlayerQuitListener;
import net.jitse.npclib.listeners.world.ChunkListener;
import net.jitse.npclib.skin.Skin;
import net.jitse.npclib.version.Version;
import org.bukkit.ChatColor;
@ -47,7 +49,9 @@ public class NPCLib {
private void registerInternal() {
PluginManager pluginManager = server.getPluginManager();
pluginManager.registerEvents(new PlayerListener(), plugin);
pluginManager.registerEvents(new PlayerChangedWorldListener(), plugin);
pluginManager.registerEvents(new PlayerQuitListener(), plugin);
pluginManager.registerEvents(new PlayerMoveOrTeleportListener(), plugin);
pluginManager.registerEvents(new ChunkListener(), plugin);
new PacketListener().start(plugin);

2
src/net/jitse/npclib/listeners/PacketListener.java → src/net/jitse/npclib/listeners/packet/PacketListener.java
View File

@ -2,7 +2,7 @@
* Copyright (c) 2018 Jitse Boonstra
*/
package net.jitse.npclib.listeners;
package net.jitse.npclib.listeners.packet;
import com.comphenix.tinyprotocol.Reflection;
import com.comphenix.tinyprotocol.TinyProtocol;

35
src/net/jitse/npclib/listeners/player/PlayerChangedWorldListener.java Normal file
View File

@ -0,0 +1,35 @@
/*
* 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.World;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerChangedWorldEvent;
/**
* @author Jitse Boonstra
*/
public class PlayerChangedWorldListener implements Listener {
@EventHandler
public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
Player player = event.getPlayer();
World from = event.getFrom();
// The PlayerTeleportEvent is call, and will handle visibility in the new world.
for (NPC npc : NPCManager.getAllNPCs()) {
if (npc.getLocation().getWorld().equals(from)) {
if (!npc.getAutoHidden().contains(player.getUniqueId())) {
npc.getAutoHidden().add(player.getUniqueId());
npc.hide(player, true);
}
}
}
}
}

21
src/net/jitse/npclib/listeners/PlayerListener.java → src/net/jitse/npclib/listeners/player/PlayerMoveOrTeleportListener.java
View File

@ -2,7 +2,7 @@
* Copyright (c) 2018 Jitse Boonstra
*/
package net.jitse.npclib.listeners;
package net.jitse.npclib.listeners.player;
import net.jitse.npclib.NPCManager;
import net.jitse.npclib.api.NPC;
@ -12,30 +12,13 @@ import org.bukkit.World;
import org.bukkit.entity.Player;
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.PlayerTeleportEvent;
/**
* @author Jitse Boonstra
*/
public class PlayerListener implements Listener {
@EventHandler
public void onPlayerChangedWorld(PlayerChangedWorldEvent event) {
Player player = event.getPlayer();
World from = event.getFrom();
// The PlayerTeleportEvent is call, and will handle visibility in the new world.
for (NPC npc : NPCManager.getAllNPCs()) {
if (npc.getLocation().getWorld().equals(from)) {
if (!npc.getAutoHidden().contains(player.getUniqueId())) {
npc.getAutoHidden().add(player.getUniqueId());
npc.hide(player, true);
}
}
}
}
public class PlayerMoveOrTeleportListener implements Listener {
@EventHandler
public void onPlayerMove(PlayerMoveEvent event) {

2
src/net/jitse/npclib/listeners/ChunkListener.java → src/net/jitse/npclib/listeners/world/ChunkListener.java
View File

@ -2,7 +2,7 @@
* Copyright (c) 2018 Jitse Boonstra
*/
package net.jitse.npclib.listeners;
package net.jitse.npclib.listeners.world;
import net.jitse.npclib.NPCManager;
import net.jitse.npclib.api.NPC;