From 6883b7efc2618496f0cce2e7504ca290875cb7a3 Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Mon, 6 Jan 2020 20:11:35 +0100 Subject: [PATCH 1/9] added scoreboard; tested; added *.iml --- .gitignore | 3 +- .../steamwar/scoreboard/SWScoreboard_10.java | 54 +++++++++++++ .../steamwar/scoreboard/SWScoreboard_12.java | 53 +++++++++++++ .../steamwar/scoreboard/SWScoreboard_14.java | 53 +++++++++++++ .../steamwar/scoreboard/SWScoreboard_15.java | 53 +++++++++++++ .../steamwar/scoreboard/SWScoreboard_8.java | 53 +++++++++++++ .../steamwar/scoreboard/SWScoreboard_9.java | 53 +++++++++++++ .../scoreboard/ScoreboardCallback.java | 12 +++ .../de/steamwar/scoreboard/SWScoreboard.java | 77 +++++++++++++++++++ 9 files changed, 410 insertions(+), 1 deletion(-) create mode 100644 SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java create mode 100644 SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java create mode 100644 SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java create mode 100644 SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java create mode 100644 SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java create mode 100644 SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java create mode 100644 SpigotCore_API/src/de/steamwar/scoreboard/ScoreboardCallback.java create mode 100644 SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java diff --git a/.gitignore b/.gitignore index 7eae63f..02142ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .idea target -dependency-reduced-pom.xml \ No newline at end of file +dependency-reduced-pom.xml +*.iml \ No newline at end of file diff --git a/SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java b/SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java new file mode 100644 index 0000000..e469622 --- /dev/null +++ b/SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java @@ -0,0 +1,54 @@ +package de.steamwar.scoreboard; + +import net.minecraft.server.v1_10_R1.*; +import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer; +import org.bukkit.entity.Player; + +import java.util.Map; + +public class SWScoreboard_10 { + + ScoreboardCallback callback; + private Scoreboard scoreboard; + private ScoreboardObjective obj; + private int switcher = 0; //switch zwischen 0 und 1 + + public SWScoreboard_10(ScoreboardCallback callback) { + this.callback = callback; + this.scoreboard = new Scoreboard(); + this.obj = this.scoreboard.registerObjective("MainBord" + switcher, IScoreboardCriteria.b); + obj.setDisplayName(this.callback.getTitle()); + } + + public void sendScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1); + PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0); + + sendPacket(player, removePacket); + sendPacket(player, createpacket); + + for(Map.Entry currentEntry : this.callback.getData().entrySet()) { + ScoreboardScore score = new ScoreboardScore(this.scoreboard, this.obj, currentEntry.getKey()); + score.setScore(currentEntry.getValue()); + PacketPlayOutScoreboardScore scorePacket = new PacketPlayOutScoreboardScore(score); + sendPacket(player, scorePacket); + } + + switcher(); + + PacketPlayOutScoreboardDisplayObjective displayPacket = new PacketPlayOutScoreboardDisplayObjective(1, this.obj); + sendPacket(player, displayPacket); + } + + private void sendPacket(Player p, Packet packet) { + ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); + } + + private void switcher() { + switcher++; + if(switcher == 1) + switcher = 0; + } + + +} diff --git a/SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java b/SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java new file mode 100644 index 0000000..66a8b5e --- /dev/null +++ b/SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java @@ -0,0 +1,53 @@ +package de.steamwar.scoreboard; + +import net.minecraft.server.v1_12_R1.*; +import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; +import org.bukkit.entity.Player; + +import java.util.Map; + +public class SWScoreboard_12 { + + ScoreboardCallback callback; + private Scoreboard scoreboard; + private ScoreboardObjective obj; + private int switcher = 0; //switch zwischen 0 und 1 + + public SWScoreboard_12(ScoreboardCallback callback) { + this.callback = callback; + this.scoreboard = new Scoreboard(); + this.obj = this.scoreboard.registerObjective("MainBord" + switcher, IScoreboardCriteria.b); + obj.setDisplayName(this.callback.getTitle()); + } + + public void sendScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1); + PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0); + + sendPacket(player, removePacket); + sendPacket(player, createpacket); + + for(Map.Entry currentEntry : this.callback.getData().entrySet()) { + ScoreboardScore score = new ScoreboardScore(this.scoreboard, this.obj, currentEntry.getKey()); + score.setScore(currentEntry.getValue()); + PacketPlayOutScoreboardScore scorePacket = new PacketPlayOutScoreboardScore(score); + sendPacket(player, scorePacket); + } + + switcher(); + + PacketPlayOutScoreboardDisplayObjective displayPacket = new PacketPlayOutScoreboardDisplayObjective(1, this.obj); + sendPacket(player, displayPacket); + } + + private void sendPacket(Player p, Packet packet) { + ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); + } + + private void switcher() { + switcher++; + if(switcher == 1) + switcher = 0; + } + +} diff --git a/SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java b/SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java new file mode 100644 index 0000000..a45b23e --- /dev/null +++ b/SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java @@ -0,0 +1,53 @@ +package de.steamwar.scoreboard; + +import net.minecraft.server.v1_14_R1.*; +import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; +import org.bukkit.entity.Player; + +import java.util.Map; + +public class SWScoreboard_14 { + + ScoreboardCallback callback; + private Scoreboard scoreboard; + private ScoreboardObjective obj; + private int switcher = 0; //switch zwischen 0 und 1 + + public SWScoreboard_14(ScoreboardCallback callback) { + this.callback = callback; + this.scoreboard = new Scoreboard(); + this.obj = this.scoreboard.registerObjective("MainBord" + switcher, IScoreboardCriteria.DUMMY, new ChatMessage("USELESS"), IScoreboardCriteria.EnumScoreboardHealthDisplay.HEARTS); + obj.setDisplayName(new ChatMessage(this.callback.getTitle())); + } + + public void sendScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1); + PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0); + + sendPacket(player, removePacket); + sendPacket(player, createpacket); + + for(Map.Entry currentEntry : this.callback.getData().entrySet()) { + ScoreboardScore score = new ScoreboardScore(this.scoreboard, this.obj, currentEntry.getKey()); + score.setScore(currentEntry.getValue()); + PacketPlayOutScoreboardScore scorePacket = new PacketPlayOutScoreboardScore(ScoreboardServer.Action.CHANGE, this.obj.getName(), score.getPlayerName(), score.getScore()); + sendPacket(player, scorePacket); + } + + switcher(); + + PacketPlayOutScoreboardDisplayObjective displayPacket = new PacketPlayOutScoreboardDisplayObjective(1, this.obj); + sendPacket(player, displayPacket); + } + + private void sendPacket(Player p, Packet packet) { + ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); + } + + private void switcher() { + switcher++; + if(switcher == 1) + switcher = 0; + } + +} diff --git a/SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java b/SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java new file mode 100644 index 0000000..b8db92d --- /dev/null +++ b/SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java @@ -0,0 +1,53 @@ +package de.steamwar.scoreboard; + +import net.minecraft.server.v1_15_R1.*; +import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; +import org.bukkit.entity.Player; + +import java.util.Map; + +public class SWScoreboard_15 { + + ScoreboardCallback callback; + private Scoreboard scoreboard; + private ScoreboardObjective obj; + private int switcher = 0; //switch zwischen 0 und 1 + + public SWScoreboard_15(ScoreboardCallback callback) { + this.callback = callback; + this.scoreboard = new Scoreboard(); + this.obj = this.scoreboard.registerObjective("MainBord" + switcher, IScoreboardCriteria.DUMMY, new ChatMessage("USELESS"), IScoreboardCriteria.EnumScoreboardHealthDisplay.HEARTS); + obj.setDisplayName(new ChatMessage(this.callback.getTitle())); + } + + public void sendScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1); + PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0); + + sendPacket(player, removePacket); + sendPacket(player, createpacket); + + for(Map.Entry currentEntry : this.callback.getData().entrySet()) { + ScoreboardScore score = new ScoreboardScore(this.scoreboard, this.obj, currentEntry.getKey()); + score.setScore(currentEntry.getValue()); + PacketPlayOutScoreboardScore scorePacket = new PacketPlayOutScoreboardScore(ScoreboardServer.Action.CHANGE, this.obj.getName(), score.getPlayerName(), score.getScore()); + sendPacket(player, scorePacket); + } + + switcher(); + + PacketPlayOutScoreboardDisplayObjective displayPacket = new PacketPlayOutScoreboardDisplayObjective(1, this.obj); + sendPacket(player, displayPacket); + } + + private void sendPacket(Player p, Packet packet) { + ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); + } + + private void switcher() { + switcher++; + if(switcher == 1) + switcher = 0; + } + +} diff --git a/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java b/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java new file mode 100644 index 0000000..f0b69ba --- /dev/null +++ b/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java @@ -0,0 +1,53 @@ +package de.steamwar.scoreboard; + +import net.minecraft.server.v1_8_R3.*; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; +import org.bukkit.entity.Player; + +import java.util.Map; + +public class SWScoreboard_8 { + + ScoreboardCallback callback; + private Scoreboard scoreboard; + private ScoreboardObjective obj; + private int switcher = 0; //switch zwischen 0 und 1 + + public SWScoreboard_8(ScoreboardCallback callback) { + this.callback = callback; + this.scoreboard = new Scoreboard(); + this.obj = this.scoreboard.registerObjective("MainBord" + switcher, IScoreboardCriteria.b); + obj.setDisplayName(this.callback.getTitle()); + } + + public void sendScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1); + PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0); + + sendPacket(player, removePacket); + sendPacket(player, createpacket); + + for(Map.Entry currentEntry : this.callback.getData().entrySet()) { + ScoreboardScore score = new ScoreboardScore(this.scoreboard, this.obj, currentEntry.getKey()); + score.setScore(currentEntry.getValue()); + PacketPlayOutScoreboardScore scorePacket = new PacketPlayOutScoreboardScore(score); + sendPacket(player, scorePacket); + } + + switcher(); + + PacketPlayOutScoreboardDisplayObjective displayPacket = new PacketPlayOutScoreboardDisplayObjective(1, this.obj); + sendPacket(player, displayPacket); + } + + private void sendPacket(Player p, Packet packet) { + ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); + } + + private void switcher() { + switcher++; + if(switcher == 1) + switcher = 0; + } + +} diff --git a/SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java b/SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java new file mode 100644 index 0000000..71f80a5 --- /dev/null +++ b/SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java @@ -0,0 +1,53 @@ +package de.steamwar.scoreboard; + +import net.minecraft.server.v1_9_R2.*; +import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer; +import org.bukkit.entity.Player; + +import java.util.Map; + +public class SWScoreboard_9 { + + ScoreboardCallback callback; + private Scoreboard scoreboard; + private ScoreboardObjective obj; + private int switcher = 0; //switch zwischen 0 und 1 + + public SWScoreboard_9(ScoreboardCallback callback) { + this.callback = callback; + this.scoreboard = new Scoreboard(); + this.obj = this.scoreboard.registerObjective("MainBord" + switcher, IScoreboardCriteria.b); + obj.setDisplayName(this.callback.getTitle()); + } + + public void sendScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1); + PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0); + + sendPacket(player, removePacket); + sendPacket(player, createpacket); + + for(Map.Entry currentEntry : this.callback.getData().entrySet()) { + ScoreboardScore score = new ScoreboardScore(this.scoreboard, this.obj, currentEntry.getKey()); + score.setScore(currentEntry.getValue()); + PacketPlayOutScoreboardScore scorePacket = new PacketPlayOutScoreboardScore(score); + sendPacket(player, scorePacket); + } + + switcher(); + + PacketPlayOutScoreboardDisplayObjective displayPacket = new PacketPlayOutScoreboardDisplayObjective(1, this.obj); + sendPacket(player, displayPacket); + } + + private void sendPacket(Player p, Packet packet) { + ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); + } + + private void switcher() { + switcher++; + if(switcher == 1) + switcher = 0; + } + +} diff --git a/SpigotCore_API/src/de/steamwar/scoreboard/ScoreboardCallback.java b/SpigotCore_API/src/de/steamwar/scoreboard/ScoreboardCallback.java new file mode 100644 index 0000000..9771cbb --- /dev/null +++ b/SpigotCore_API/src/de/steamwar/scoreboard/ScoreboardCallback.java @@ -0,0 +1,12 @@ +package de.steamwar.scoreboard; + +import java.util.HashMap; + +public interface ScoreboardCallback { + + HashMap getData(); + + String getTitle(); + + +} diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java new file mode 100644 index 0000000..bf36558 --- /dev/null +++ b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java @@ -0,0 +1,77 @@ +package de.steamwar.scoreboard; + +import de.steamwar.core.Core; +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; + +import java.util.HashMap; +import java.util.Map; + +public class SWScoreboard { + + private static HashMap playerBoards = new HashMap<>(); //Object -> Scoreboard | Alle Versionen in der Map! + + public static boolean createScoreboard(Player player, ScoreboardCallback callback) { + Object swScoreboardObject; + switch (Core.getVersion()) { + case 8: + swScoreboardObject = new SWScoreboard_8(callback); + break; + case 9: + swScoreboardObject = new SWScoreboard_9(callback); + break; + case 10: + swScoreboardObject = new SWScoreboard_10(callback); + break; + case 12: + swScoreboardObject = new SWScoreboard_12(callback); + break; + case 14: + swScoreboardObject = new SWScoreboard_14(callback); + break; + case 15: + swScoreboardObject = new SWScoreboard_15(callback); + break; + default: + return false; //Kein Scoreboard senden + } + playerBoards.put(player, swScoreboardObject); + return true; + } + + public static void removeScoreboard(Player player) { + if(playerBoards.containsKey(player)) + playerBoards.remove(player); + } + + //Scoreboard Updater + static { + Bukkit.getScheduler().scheduleAsyncRepeatingTask(Core.getInstance(), () -> { + synchronized (playerBoards) { + for(Map.Entry entry : playerBoards.entrySet()) { + switch (Core.getVersion()) { + case 8: + ((SWScoreboard_8) entry.getValue()).sendScoreboard(entry.getKey()); + break; + case 9: + ((SWScoreboard_9) entry.getValue()).sendScoreboard(entry.getKey()); + break; + case 10: + ((SWScoreboard_10) entry.getValue()).sendScoreboard(entry.getKey()); + break; + case 12: + ((SWScoreboard_12) entry.getValue()).sendScoreboard(entry.getKey()); + break; + case 14: + ((SWScoreboard_14) entry.getValue()).sendScoreboard(entry.getKey()); + break; + case 15: + ((SWScoreboard_15) entry.getValue()).sendScoreboard(entry.getKey()); + break; + } + } + } + }, 10, 5); + } + +} From 5705e1d87d084c482d2d5c781a18e70bfe0781c6 Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Mon, 6 Jan 2020 20:13:46 +0100 Subject: [PATCH 2/9] hotfix --- SpigotCore_10/SpigotCore_10.iml | 18 ++++++++++++++++++ SpigotCore_15/SpigotCore_15.iml | 19 +++++++++++++++++++ SpigotCore_9/SpigotCore_9.iml | 17 +++++++++++++++++ SpigotCore_API/SpigotCore_API.iml | 13 +++++++++++++ .../de/steamwar/scoreboard/SWScoreboard.java | 2 ++ 5 files changed, 69 insertions(+) create mode 100644 SpigotCore_10/SpigotCore_10.iml create mode 100644 SpigotCore_15/SpigotCore_15.iml create mode 100644 SpigotCore_9/SpigotCore_9.iml create mode 100644 SpigotCore_API/SpigotCore_API.iml diff --git a/SpigotCore_10/SpigotCore_10.iml b/SpigotCore_10/SpigotCore_10.iml new file mode 100644 index 0000000..00cd5eb --- /dev/null +++ b/SpigotCore_10/SpigotCore_10.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SpigotCore_15/SpigotCore_15.iml b/SpigotCore_15/SpigotCore_15.iml new file mode 100644 index 0000000..9f1a87e --- /dev/null +++ b/SpigotCore_15/SpigotCore_15.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SpigotCore_9/SpigotCore_9.iml b/SpigotCore_9/SpigotCore_9.iml new file mode 100644 index 0000000..51fe3d8 --- /dev/null +++ b/SpigotCore_9/SpigotCore_9.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SpigotCore_API/SpigotCore_API.iml b/SpigotCore_API/SpigotCore_API.iml new file mode 100644 index 0000000..3798270 --- /dev/null +++ b/SpigotCore_API/SpigotCore_API.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java index bf36558..81b3b71 100644 --- a/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java +++ b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java @@ -9,6 +9,8 @@ import java.util.Map; public class SWScoreboard { + private SWScoreboard() { } + private static HashMap playerBoards = new HashMap<>(); //Object -> Scoreboard | Alle Versionen in der Map! public static boolean createScoreboard(Player player, ScoreboardCallback callback) { From 859184a4b981ca322bb69f05ee0465efbd1f4616 Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Mon, 6 Jan 2020 20:41:22 +0100 Subject: [PATCH 3/9] =?UTF-8?q?=E2=80=9ESpigotCore=5FAPI/SpigotCore=5FAPI.?= =?UTF-8?q?iml=E2=80=9C=20l=C3=B6schen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpigotCore_API/SpigotCore_API.iml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 SpigotCore_API/SpigotCore_API.iml diff --git a/SpigotCore_API/SpigotCore_API.iml b/SpigotCore_API/SpigotCore_API.iml deleted file mode 100644 index 3798270..0000000 --- a/SpigotCore_API/SpigotCore_API.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file From 0c5129f20c3cc6290958f493479fd81f33c6e2d1 Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Mon, 6 Jan 2020 20:41:35 +0100 Subject: [PATCH 4/9] =?UTF-8?q?=E2=80=9ESpigotCore=5F15/SpigotCore=5F15.im?= =?UTF-8?q?l=E2=80=9C=20l=C3=B6schen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpigotCore_15/SpigotCore_15.iml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 SpigotCore_15/SpigotCore_15.iml diff --git a/SpigotCore_15/SpigotCore_15.iml b/SpigotCore_15/SpigotCore_15.iml deleted file mode 100644 index 9f1a87e..0000000 --- a/SpigotCore_15/SpigotCore_15.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 9d311807396701020c555d0c75bb9cd9feb4c179 Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Mon, 6 Jan 2020 20:41:52 +0100 Subject: [PATCH 5/9] =?UTF-8?q?=E2=80=9ESpigotCore=5F9/SpigotCore=5F9.iml?= =?UTF-8?q?=E2=80=9C=20l=C3=B6schen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpigotCore_9/SpigotCore_9.iml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 SpigotCore_9/SpigotCore_9.iml diff --git a/SpigotCore_9/SpigotCore_9.iml b/SpigotCore_9/SpigotCore_9.iml deleted file mode 100644 index 51fe3d8..0000000 --- a/SpigotCore_9/SpigotCore_9.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file From 1c748cc5b97163bf5b8a85f3e1b98d788af12e6f Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Mon, 6 Jan 2020 21:22:16 +0100 Subject: [PATCH 6/9] hotfix --- .../steamwar/scoreboard/SWScoreboard_10.java | 9 ++++-- .../steamwar/scoreboard/SWScoreboard_12.java | 9 ++++-- .../steamwar/scoreboard/SWScoreboard_14.java | 9 ++++-- .../steamwar/scoreboard/SWScoreboard_15.java | 5 ++++ .../steamwar/scoreboard/SWScoreboard_8.java | 9 ++++-- .../steamwar/scoreboard/SWScoreboard_9.java | 9 ++++-- .../de/steamwar/scoreboard/SWScoreboard.java | 29 +++++++++++++++++-- 7 files changed, 67 insertions(+), 12 deletions(-) diff --git a/SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java b/SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java index e469622..bf070b4 100644 --- a/SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java +++ b/SpigotCore_10/src/de/steamwar/scoreboard/SWScoreboard_10.java @@ -21,8 +21,8 @@ public class SWScoreboard_10 { } public void sendScoreboard(Player player) { - PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1); - PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0); + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1); + PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(this.obj, 0); sendPacket(player, removePacket); sendPacket(player, createpacket); @@ -40,6 +40,11 @@ public class SWScoreboard_10 { sendPacket(player, displayPacket); } + public void deleteScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1); + sendPacket(player, removePacket); + } + private void sendPacket(Player p, Packet packet) { ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); } diff --git a/SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java b/SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java index 66a8b5e..943a283 100644 --- a/SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java +++ b/SpigotCore_12/src/de/steamwar/scoreboard/SWScoreboard_12.java @@ -21,8 +21,8 @@ public class SWScoreboard_12 { } public void sendScoreboard(Player player) { - PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1); - PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0); + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1); + PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(this.obj, 0); sendPacket(player, removePacket); sendPacket(player, createpacket); @@ -40,6 +40,11 @@ public class SWScoreboard_12 { sendPacket(player, displayPacket); } + public void deleteScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1); + sendPacket(player, removePacket); + } + private void sendPacket(Player p, Packet packet) { ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); } diff --git a/SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java b/SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java index a45b23e..e0ff69d 100644 --- a/SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java +++ b/SpigotCore_14/src/de/steamwar/scoreboard/SWScoreboard_14.java @@ -21,8 +21,8 @@ public class SWScoreboard_14 { } public void sendScoreboard(Player player) { - PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1); - PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0); + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1); + PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(this.obj, 0); sendPacket(player, removePacket); sendPacket(player, createpacket); @@ -40,6 +40,11 @@ public class SWScoreboard_14 { sendPacket(player, displayPacket); } + public void deleteScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1); + sendPacket(player, removePacket); + } + private void sendPacket(Player p, Packet packet) { ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); } diff --git a/SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java b/SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java index b8db92d..a761db7 100644 --- a/SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java +++ b/SpigotCore_15/src/de/steamwar/scoreboard/SWScoreboard_15.java @@ -40,6 +40,11 @@ public class SWScoreboard_15 { sendPacket(player, displayPacket); } + public void deleteScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1); + sendPacket(player, removePacket); + } + private void sendPacket(Player p, Packet packet) { ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); } diff --git a/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java b/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java index f0b69ba..0e9fd71 100644 --- a/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java +++ b/SpigotCore_8/src/de/steamwar/scoreboard/SWScoreboard_8.java @@ -21,8 +21,8 @@ public class SWScoreboard_8 { } public void sendScoreboard(Player player) { - PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1); - PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0); + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1); + PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(this.obj, 0); sendPacket(player, removePacket); sendPacket(player, createpacket); @@ -40,6 +40,11 @@ public class SWScoreboard_8 { sendPacket(player, displayPacket); } + public void deleteScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1); + sendPacket(player, removePacket); + } + private void sendPacket(Player p, Packet packet) { ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); } diff --git a/SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java b/SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java index 71f80a5..f53ccdd 100644 --- a/SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java +++ b/SpigotCore_9/src/de/steamwar/scoreboard/SWScoreboard_9.java @@ -21,8 +21,8 @@ public class SWScoreboard_9 { } public void sendScoreboard(Player player) { - PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(obj, 1); - PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(obj, 0); + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1); + PacketPlayOutScoreboardObjective createpacket = new PacketPlayOutScoreboardObjective(this.obj, 0); sendPacket(player, removePacket); sendPacket(player, createpacket); @@ -40,6 +40,11 @@ public class SWScoreboard_9 { sendPacket(player, displayPacket); } + public void deleteScoreboard(Player player) { + PacketPlayOutScoreboardObjective removePacket = new PacketPlayOutScoreboardObjective(this.obj, 1); + sendPacket(player, removePacket); + } + private void sendPacket(Player p, Packet packet) { ((CraftPlayer)p).getHandle().playerConnection.sendPacket(packet); } diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java index 81b3b71..883057b 100644 --- a/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java +++ b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java @@ -41,9 +41,34 @@ public class SWScoreboard { return true; } - public static void removeScoreboard(Player player) { - if(playerBoards.containsKey(player)) + public boolean removeScoreboard(Player player) { + if(playerBoards.containsKey(player)) { + switch (Core.getVersion()) { + case 8: + ((SWScoreboard_8) playerBoards.get(player)).deleteScoreboard(player); + break; + case 9: + ((SWScoreboard_9) playerBoards.get(player)).deleteScoreboard(player); + break; + case 10: + ((SWScoreboard_10) playerBoards.get(player)).deleteScoreboard(player); + break; + case 12: + ((SWScoreboard_12) playerBoards.get(player)).deleteScoreboard(player); + break; + case 14: + ((SWScoreboard_14) playerBoards.get(player)).deleteScoreboard(player); + break; + case 15: + ((SWScoreboard_15) playerBoards.get(player)).deleteScoreboard(player); + break; + default: + return false; + } playerBoards.remove(player); + return true; + } + return false; } //Scoreboard Updater From bbc66371f1d91a20320bd602a83a8b3c51d217c3 Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Tue, 7 Jan 2020 13:47:32 +0100 Subject: [PATCH 7/9] . --- SpigotCore.iml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 SpigotCore.iml diff --git a/SpigotCore.iml b/SpigotCore.iml new file mode 100644 index 0000000..f409c0e --- /dev/null +++ b/SpigotCore.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file From a87514f0241ba6f37a28957970e05039483879c6 Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Tue, 7 Jan 2020 13:50:50 +0100 Subject: [PATCH 8/9] =?UTF-8?q?=E2=80=9ESpigotCore.iml=E2=80=9C=20l=C3=B6s?= =?UTF-8?q?chen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpigotCore.iml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 SpigotCore.iml diff --git a/SpigotCore.iml b/SpigotCore.iml deleted file mode 100644 index f409c0e..0000000 --- a/SpigotCore.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file From d2e1ab5b7fc7bd16b242a56d68e797900cee5ea8 Mon Sep 17 00:00:00 2001 From: Yaruma3341 Date: Tue, 7 Jan 2020 13:51:19 +0100 Subject: [PATCH 9/9] =?UTF-8?q?=E2=80=9ESpigotCore=5F10/SpigotCore=5F10.im?= =?UTF-8?q?l=E2=80=9C=20l=C3=B6schen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpigotCore_10/SpigotCore_10.iml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 SpigotCore_10/SpigotCore_10.iml diff --git a/SpigotCore_10/SpigotCore_10.iml b/SpigotCore_10/SpigotCore_10.iml deleted file mode 100644 index 00cd5eb..0000000 --- a/SpigotCore_10/SpigotCore_10.iml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file