Fix some stuff

SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java

@@ -20,8 +20,6 @@
 package de.steamwar.core;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import de.steamwar.Reflection;
 import de.steamwar.command.*;
 import de.steamwar.core.authlib.AuthlibInjector;
@@ -38,37 +36,23 @@ import de.steamwar.sql.internal.Statement;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.plugin.messaging.PluginMessageListener;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.logging.Level;
 
-public class Core extends JavaPlugin implements PluginMessageListener, Listener {
+public class Core extends JavaPlugin {
 
 	public static final Message MESSAGE = new Message("SpigotCore", Core.class.getClassLoader());
 
-	private static final String CHANNEL = "vv:proxy_details";
-	private static final Gson GSON = new Gson();
-	private static final Map<Player, Integer> playerVersions = new HashMap<>();
-
 	public static int getVersion(){
 		return Reflection.MAJOR_VERSION;
 	}
 
-	public static int getPlayerVersion(Player player) {
-		return playerVersions.getOrDefault(player, -1);
-	}
-
 	public static boolean isBedrockPlayer(Player player) {
 		return player.getName().startsWith(".");
 	}
@@ -91,8 +75,7 @@ public class Core extends JavaPlugin implements PluginMessageListener, Listener
 	
 	@Override
 	public void onEnable() {
-		this.getServer().getMessenger().registerIncomingPluginChannel(this, CHANNEL, this);
-		Bukkit.getPluginManager().registerEvents(this, this);
+		new PlayerVersion();
 
 		errorHandler = new ErrorHandler();
 		crashDetector = new CrashDetector();
@@ -151,20 +134,4 @@ public class Core extends JavaPlugin implements PluginMessageListener, Listener
 			Statement.closeAll();
 		this.getServer().getMessenger().unregisterIncomingPluginChannel(this);
 	}
-
-	@Override
-	public void onPluginMessageReceived(String channel, Player player, byte[] bytes) {
-		if (!channel.equals(CHANNEL)) {
-			return;
-		}
-
-		final JsonObject payload = GSON.fromJson(new String(bytes), JsonObject.class);
-		final String version = payload.get("versionName").getAsString();
-		playerVersions.put(player, Integer.parseInt(version.split("-")[0].split("\\.")[1]));
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void onPlayerQuit(PlayerQuitEvent event) {
-		playerVersions.remove(event.getPlayer());
-	}
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/core/PlayerVersion.java

@@ -0,0 +1,65 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.core;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.plugin.messaging.PluginMessageListener;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PlayerVersion implements PluginMessageListener, Listener {
+
+    private static final String PLAYER_VERSION_CHANNEL = "vv:proxy_details";
+    private static final Gson GSON = new Gson();
+    private static final Map<Player, Integer> playerVersions = new HashMap<>();
+
+    public static int getVersion(Player player) {
+        return playerVersions.getOrDefault(player, -1);
+    }
+
+    public PlayerVersion() {
+        Core.getInstance().getServer().getMessenger().registerIncomingPluginChannel(Core.getInstance(), PLAYER_VERSION_CHANNEL, this);
+        Bukkit.getPluginManager().registerEvents(this, Core.getInstance());
+    }
+
+    @Override
+    public void onPluginMessageReceived(String channel, Player player, byte[] bytes) {
+        if (!channel.equals(PLAYER_VERSION_CHANNEL)) {
+            return;
+        }
+
+        final JsonObject payload = GSON.fromJson(new String(bytes), JsonObject.class);
+        final String version = payload.get("versionName").getAsString();
+        playerVersions.put(player, Integer.parseInt(version.split("-")[0].split("\\.")[1]));
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        playerVersions.remove(event.getPlayer());
+    }
+}

SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRenderer.java

@@ -105,11 +105,6 @@ public class WorldEditRenderer implements Listener {
         }
     }
 
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        renderPlayer(event.getPlayer());
-    }
-
     @EventHandler
     public void onPlayerMove(PlayerMoveEvent event) {
         if(event.getPlayer().getItemInHand().getType() == WAND) {

SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditRendererWrapper.java

@@ -27,7 +27,7 @@ public interface WorldEditRendererWrapper {
     WorldEditRendererWrapper impl = VersionDependent.getVersionImpl(Core.getInstance());
 
     static void safeDraw(Player player, Player owner, boolean clipboard, Vector pos1, Vector pos2) {
-        if (Core.isBedrockPlayer(player) || Core.getPlayerVersion(player) < 20) {
+        if (Core.isBedrockPlayer(player) || PlayerVersion.getVersion(player) < 20) {
             fallback.draw(player, owner, clipboard, pos1, pos2);
         } else {
             impl.draw(player, owner, clipboard, pos1, pos2);