Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-28 21:15:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
KennyTV 2020-12-09 11:31:51 +01:00
commit 4714a3f03a
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bukkit/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java
View File

@ -53,7 +53,6 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform<Player>
// Init platform // Init platform
BukkitViaInjector injector = new BukkitViaInjector(); BukkitViaInjector injector = new BukkitViaInjector();
injector.setProtocolLib(Bukkit.getPluginManager().getPlugin("ProtocolLib") != null); injector.setProtocolLib(Bukkit.getPluginManager().getPlugin("ProtocolLib") != null);
Bukkit.getPluginManager().registerEvents(new ProtocolLibEnableListener(injector), this);
Via.init(ViaManager.builder() Via.init(ViaManager.builder()
.platform(this) .platform(this)
@ -117,6 +116,8 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform<Player>
getCommand("viaversion").setExecutor(commandHandler); getCommand("viaversion").setExecutor(commandHandler);
getCommand("viaversion").setTabCompleter(commandHandler); getCommand("viaversion").setTabCompleter(commandHandler);
getServer().getPluginManager().registerEvents(new ProtocolLibEnableListener(), this);
// Warn them if they have anti-xray on and they aren't using spigot // Warn them if they have anti-xray on and they aren't using spigot
if (conf.isAntiXRay() && !spigot) { if (conf.isAntiXRay() && !spigot) {
getLogger().info("You have anti-xray on in your config, since you're not using spigot it won't fix xray!"); getLogger().info("You have anti-xray on in your config, since you're not using spigot it won't fix xray!");

10
bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/ProtocolLibEnableListener.java
View File

@ -4,26 +4,22 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.event.server.PluginEnableEvent;
import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.bukkit.platform.BukkitViaInjector; import us.myles.ViaVersion.bukkit.platform.BukkitViaInjector;
public class ProtocolLibEnableListener implements Listener { public class ProtocolLibEnableListener implements Listener {
private final BukkitViaInjector injector;
public ProtocolLibEnableListener(BukkitViaInjector injector) {
this.injector = injector;
}
@EventHandler @EventHandler
public void onPluginEnable(PluginEnableEvent e) { public void onPluginEnable(PluginEnableEvent e) {
if (e.getPlugin().getName().equals("ProtocolLib")) { if (e.getPlugin().getName().equals("ProtocolLib")) {
injector.setProtocolLib(true); ((BukkitViaInjector) Via.getManager().getInjector()).setProtocolLib(true);
} }
} }
@EventHandler @EventHandler
public void onPluginDisable(PluginDisableEvent e) { public void onPluginDisable(PluginDisableEvent e) {
if (e.getPlugin().getName().equals("ProtocolLib")) { if (e.getPlugin().getName().equals("ProtocolLib")) {
injector.setProtocolLib(false); ((BukkitViaInjector) Via.getManager().getInjector()).setProtocolLib(false);
} }
} }
} }