Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-22 15:05:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed PacketAdapter NPE

Browse Source
This commit is contained in:
Auxilor 2020-12-12 09:49:05 +00:00
parent 9e45469e6e
commit b9c3c27c21
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java
View File

@ -22,11 +22,6 @@ public class EcoEnchantsPlugin extends JavaPlugin {
*/
private final ExtensionLoader loader = new EcoExtensionLoader();
/**
* ProtocolLib
*/
private final ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
/**
* NMS version
*/
@ -61,14 +56,6 @@ public class EcoEnchantsPlugin extends JavaPlugin {
return loader;
}
/**
* Get ProtocolLib protocol manager
* @return The {@link ProtocolManager} that EcoEnchants interacts with
*/
public ProtocolManager getProtocolManager() {
return protocolManager;
}
/**
* Get plugin instance
* @return Plugin instance

5
Plugin/src/main/java/com/willfp/ecoenchants/display/AbstractPacketAdapter.java
View File

@ -1,6 +1,7 @@
package com.willfp.ecoenchants.display;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.ListenerPriority;
import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketContainer;
@ -49,8 +50,8 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
}
public final void register() {
if(!EcoEnchantsPlugin.getInstance().getProtocolManager().getPacketListeners().contains(this)) {
EcoEnchantsPlugin.getInstance().getProtocolManager().addPacketListener(this);
if(!ProtocolLibrary.getProtocolManager().getPacketListeners().contains(this)) {
ProtocolLibrary.getProtocolManager().addPacketListener(this);
}
}
}