diff --git a/src/main/java/tech/nully/BossBarAPI/BossBar.java b/src/main/java/tech/nully/BossBarAPI/BossBar.java index 377e545..e0b96eb 100644 --- a/src/main/java/tech/nully/BossBarAPI/BossBar.java +++ b/src/main/java/tech/nully/BossBarAPI/BossBar.java @@ -62,7 +62,9 @@ public class BossBar { public void delete() { if (dragon != null) { if (dragon.created) { - t.cancel(); + if (t != null) { + t.cancel(); + } dragon.destroy(); } } diff --git a/src/main/java/tech/nully/BossBarAPI/Main.java b/src/main/java/tech/nully/BossBarAPI/Main.java index de4cbc8..4241a2f 100644 --- a/src/main/java/tech/nully/BossBarAPI/Main.java +++ b/src/main/java/tech/nully/BossBarAPI/Main.java @@ -22,14 +22,7 @@ public class Main extends JavaPlugin { instance = this; System.out.println("BossBar is on"); getCommand("bossbar").setExecutor(new FakeWitherCommand()); - ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(this, PacketType.Play.Server.NAMED_SOUND_EFFECT) { - @Override - public void onPacketSending(PacketEvent event) { - PacketContainer cont = new PacketContainer(event.getPacketType()); - //TODO - } - }); - } + } // Overrides onDisable @Override diff --git a/src/main/java/tech/nully/BossBarAPI/SpawnFakeWither.java b/src/main/java/tech/nully/BossBarAPI/SpawnFakeWither.java index 8757789..d3bfd42 100644 --- a/src/main/java/tech/nully/BossBarAPI/SpawnFakeWither.java +++ b/src/main/java/tech/nully/BossBarAPI/SpawnFakeWither.java @@ -4,6 +4,7 @@ import com.comphenix.packetwrapper.Packet18SpawnMob; import com.comphenix.packetwrapper.Packet1DDestroyEntity; import com.comphenix.packetwrapper.Packet28EntityMetadata; import com.comphenix.protocol.ProtocolManager; +import com.comphenix.protocol.injector.PlayerLoggedOutException; import com.comphenix.protocol.wrappers.WrappedDataWatcher; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -33,7 +34,7 @@ public class SpawnFakeWither extends JavaPlugin { // Unique ID public int id = NEXT_ID++; // Default health - public int health = 300; + public int health = 200; public String customName; public boolean created; @@ -42,7 +43,7 @@ public class SpawnFakeWither extends JavaPlugin { public Player p; public FakeWither(Player p, ProtocolManager manager) { - this.location = new Location(p.getWorld(), p.getLocation().getX(), p.getLocation().getY() - 30, p.getLocation().getZ()); + this.location = new Location(p.getWorld(), p.getLocation().getX(), p.getLocation().getY() - 45, p.getLocation().getZ()); this.manager = manager; this.p = p; } @@ -135,7 +136,7 @@ public class SpawnFakeWither extends JavaPlugin { manager.sendServerPacket(p, destroyMe.getHandle()); } catch (InvocationTargetException e) { Bukkit.getLogger().log(Level.WARNING, "Cannot send " + destroyMe.getHandle() + " to " + p, e); - } + } catch (PlayerLoggedOutException ignored) {} created = false; } } diff --git a/target/BossBarAPI-0.0.1.jar b/target/BossBarAPI-0.0.1.jar index 90c1020..18d4a0a 100644 Binary files a/target/BossBarAPI-0.0.1.jar and b/target/BossBarAPI-0.0.1.jar differ diff --git a/target/original-BossBarAPI-0.0.1.jar b/target/original-BossBarAPI-0.0.1.jar index 267b574..a2e4767 100644 Binary files a/target/original-BossBarAPI-0.0.1.jar and b/target/original-BossBarAPI-0.0.1.jar differ