Updated to Spigot 1.17

README.md

@@ -16,8 +16,7 @@ This is a Bukkit/Spigot plugin for permissions, multiworld features and other ad
 
 ## Develpement and Version
 
-API Version: *1.14.x*<br>
-Spigot Version: *1.14.4-R0.1-SNAPSHOT*<br>
+API Version: *1.17.x*<br>
 Plugin Version: *v1.7*<br>
 Java Class Version: *52 (Java8)*<br>
 

plugin.yml

@@ -2,7 +2,7 @@ main: serversystem.main.ServerSystem
 name: ServerSystem
 version: 1.7
 author: Der_Zauberer
-api-version: 1.14
+api-version: 1.17
 
 commands:
   admin:

src/serversystem/events/PlayerDeathListener.java

@@ -1,36 +1,24 @@
 package serversystem.events;
 
-import org.bukkit.Bukkit;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
-
-import net.minecraft.server.v1_14_R1.PacketPlayInClientCommand;
-import net.minecraft.server.v1_14_R1.PacketPlayInClientCommand.EnumClientCommand;
 import serversystem.config.Config;
 import serversystem.handler.ChatHandler;
 import serversystem.handler.WorldGroupHandler;
-import serversystem.main.ServerSystem;
 
 public class PlayerDeathListener implements Listener {
 
 	@EventHandler
-	public void onPlayerDeath(PlayerDeathEvent event) {
+	public void onDeath(PlayerDeathEvent event) {
 		if(event.getEntity() instanceof Player && WorldGroupHandler.isEnabled()) {
 			World world = event.getEntity().getWorld();
 			if(Config.hasDeathMessage(world.getName())) {
 				ChatHandler.sendServerWorldGroupMessage(WorldGroupHandler.getWorldGroup(event.getEntity()), event.getDeathMessage());
 			}
-			Bukkit.getScheduler().runTaskLater(ServerSystem.getInstance(), new Runnable() {
-				@Override
-				public void run() {
-					((CraftPlayer) event.getEntity()).getHandle().playerConnection.a(new PacketPlayInClientCommand(EnumClientCommand.PERFORM_RESPAWN));
-					event.getEntity().teleport(world.getSpawnLocation());
-				}
-			}, 10);
+			WorldGroupHandler.playerdeaths.put(event.getEntity(), world);
 		}
 		event.setDeathMessage("");
 	}

src/serversystem/events/PlayerJoinListener.java

@@ -3,17 +3,15 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
-import net.minecraft.server.v1_14_R1.PacketPlayOutTitle.EnumTitleAction;
 import serversystem.config.Config;
 import serversystem.handler.ChatHandler;
-import serversystem.handler.PlayerPacketHandler;
 import serversystem.handler.PermissionHandler;
 import serversystem.handler.WorldGroupHandler;
 
 public class PlayerJoinListener implements Listener {
 
 	@EventHandler
-	public void onJoinEvent(PlayerJoinEvent event) {
+	public void onJoin(PlayerJoinEvent event) {
 		if(Config.isJoinMessageActiv()) {
 			event.setJoinMessage(ChatHandler.getPlayerJoinMessage(event));
 		} else {
@@ -28,8 +26,9 @@ public void onJoinEvent(PlayerJoinEvent event) {
 			event.getPlayer().teleport(Config.getLobbyWorld().getSpawnLocation());
 		}
 		event.getPlayer().setGameMode(Config.getWorldGamemode(event.getPlayer().getWorld().getName()));
-		if(Config.getTitle() != null) {PlayerPacketHandler.sendTitle(event.getPlayer(), EnumTitleAction.TITLE, Config.getTitle(), Config.getTitleColor(), 100);}
-		if(Config.getSubtitle() != null) {PlayerPacketHandler.sendTitle(event.getPlayer(), EnumTitleAction.SUBTITLE, Config.getSubtitle(), Config.getSubtitleColor(), 100);}
+		if(Config.getTitle() != null && Config.getSubtitle() != null) {
+			ChatHandler.sendTitle(event.getPlayer(), ChatHandler.parseColor(Config.getTitleColor()) + Config.getTitle(), ChatHandler.parseColor(Config.getSubtitleColor()) + Config.getSubtitle());
+		}
 		event.getPlayer().setPlayerListHeader(ChatHandler.parseColor(Config.getTablistTitleColor()) + Config.getTablistTitle());
 		event.getPlayer().setPlayerListFooter(ChatHandler.parseColor(Config.getTablistSubtitleColor()) + Config.getTablistSubtitle());
 	}

src/serversystem/events/PlayerQuitListener.java

@@ -12,7 +12,7 @@
 public class PlayerQuitListener implements Listener {
 
 	@EventHandler
-	public void onQuitEvent(PlayerQuitEvent event) {
+	public void onQuit(PlayerQuitEvent event) {
 		if(Config.isLeaveMessageActiv()) {
 			event.setQuitMessage(ChatHandler.getPlayerQuitMessage(event));
 		} else {

src/serversystem/events/PlayerRespawnListener.java

@@ -0,0 +1,17 @@
+package serversystem.events;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerRespawnEvent;
+
+import serversystem.handler.WorldGroupHandler;
+
+public class PlayerRespawnListener implements Listener {
+
+	@EventHandler
+	public void onRespawn(PlayerRespawnEvent event) {
+		event.setRespawnLocation(WorldGroupHandler.playerdeaths.get(event.getPlayer()).getSpawnLocation());
+		WorldGroupHandler.playerdeaths.remove(event.getPlayer());
+	}
+
+}

src/serversystem/handler/ChatHandler.java

@@ -9,7 +9,6 @@
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-
 import serversystem.config.Config;
 import serversystem.utilities.WorldGroup;
 
@@ -20,6 +19,7 @@ public class ChatHandler implements Listener {
 	private static String servername = parseColor(Config.getMessagePrefixColor()) + Config.getMessagePrefix();
 
 	public static enum ErrorMessage{ONLYCONSOLE, ONLYPLAYER, NOPERMISSION, PLAYERNOTONLINE, WORLDDOESNOTEXIST, NOTENOUGHTARGUMENTS}
+	public static enum TitleType{TITLE, SUBTITLE, ACTIONBAR}
 
 	public static void sendServerMessage(Player player, String message) {
 		player.sendMessage(servername + messagecolor + " " + message);
@@ -83,6 +83,10 @@ public static void sendServerWorldGroupMessage(WorldGroup worldgroup, String mes
 
 	}
 
+	public static void sendTitle(Player player, String title, String subtitle) {
+		player.sendTitle(title, subtitle, 10, 100, 10);
+	}
+
 	public static String getPlayerJoinMessage(PlayerJoinEvent event) {
 		return servername + messagecolor + " " + event.getPlayer().getName() + " joined the game!";
 	}

src/serversystem/handler/WorldGroupHandler.java

@@ -1,6 +1,8 @@
 package serversystem.handler;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
@@ -15,6 +17,8 @@ public enum WorldSetting{DAMAGE, EXPLOSION, HUNGER, PROTECTION, PVP}
 	private static ArrayList<WorldGroup> worldgroups = new ArrayList<>();
 	private static boolean enabled = Config.isWorldGroupSystemEnabled();
 
+	public static HashMap<Player, World> playerdeaths = new HashMap<>();
+
 	public static void autoCreateWorldGroups() {
 		for (World world : Bukkit.getWorlds()) {
 			String worldgroup = Config.getWorldGroup(world.getName());

src/serversystem/main/ServerSystem.java

@@ -22,6 +22,7 @@
 import serversystem.events.PlayerDeathListener;
 import serversystem.events.PlayerJoinListener;
 import serversystem.events.PlayerQuitListener;
+import serversystem.events.PlayerRespawnListener;
 import serversystem.events.PlayerTeleportListener;
 import serversystem.handler.ChatHandler;
 import serversystem.handler.InventoryHandler;
@@ -81,6 +82,7 @@ private void registerEvents() {
 		Bukkit.getPluginManager().registerEvents(new PlayerDeathListener(), this);
 		Bukkit.getPluginManager().registerEvents(new PlayerJoinListener(), this);
 		Bukkit.getPluginManager().registerEvents(new PlayerQuitListener(), this);
+		Bukkit.getPluginManager().registerEvents(new PlayerRespawnListener(), this);
 		Bukkit.getPluginManager().registerEvents(new PlayerTeleportListener(), this);
 
 		Bukkit.getPluginManager().registerEvents(new ChatHandler(), this);

src/serversystem/menus/AdminMenu.java

@@ -33,7 +33,7 @@ public AdminMenu(Player player) {
 	}
 
 	private void addPtionEffect(Player player, PotionEffectType effect) {
-		player.addPotionEffect(new PotionEffect(effect, 12000, 2), true);
+		player.addPotionEffect(new PotionEffect(effect, 12000, 2));
 	}
 
 	private void removeEffects(Player player) {

src/serversystem/menus/PlayerMenu.java

@@ -29,7 +29,7 @@ public PlayerMenu(Player player, Player target) {
 	}
 
 	private void addPotionEffect(Player player, PotionEffectType effect) {
-		player.addPotionEffect(new PotionEffect(effect, 12000, 2), true);
+		player.addPotionEffect(new PotionEffect(effect, 12000, 2));
 	}
 
 	private void removeEffects(Player player) {