Fix logic for bed respawn

Author: lululombard

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>fr.fluffevent.fluffyteams</groupId>
 	<artifactId>FluffyTeams</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
+	<version>0.1.1-SNAPSHOT</version>
 
 	<repositories>
 		<repository>

src/main/java/fr/fluffevent/fluffyteams/Config.java

@@ -40,6 +40,13 @@ public class Config {
    */
   public static boolean overrideBedRespawnLocation = false;
 
+  /**
+   * Whether to override the player's anchor respawn location with team spawn.
+   * If true, players will always respawn at their team spawn instead of their
+   * anchors.
+   */
+  public static boolean overrideAnchorRespawnLocation = false;
+
   /**
    * Loads configuration values from config.yml.
    * Creates the default configuration file if it doesn't exist.
@@ -56,5 +63,6 @@ public static void readConfig(JavaPlugin plugin) {
     databasePassword = config.getString("database-password");
     serverName = config.getString("server-name");
     overrideBedRespawnLocation = config.getBoolean("override-bed-respawn-location", false);
+    overrideAnchorRespawnLocation = config.getBoolean("override-anchor-respawn-location", false);
   }
 }

src/main/java/fr/fluffevent/fluffyteams/controllers/TeamController.java

@@ -352,6 +352,7 @@ public boolean removeOfflineMember(String username) {
         // If couldn't get UUID from Mojang, try with Bukkit's offline player (for
         // players who have connected before)
         if (playerUUID == null) {
+            @SuppressWarnings("deprecation")
             OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(username);
             if (offlinePlayer.hasPlayedBefore()) {
                 playerUUID = offlinePlayer.getUniqueId();

src/main/java/fr/fluffevent/fluffyteams/listeners/PlayerRespawnListener.java

@@ -23,7 +23,11 @@ public PlayerRespawnListener() {
     public void onPlayerRespawn(PlayerRespawnEvent event) {
         Player player = event.getPlayer();
 
-        if (player.getBedLocation() != null && !Config.overrideBedRespawnLocation) {
+        if (event.isBedSpawn() && !Config.overrideBedRespawnLocation) {
+            return;
+        }
+
+        if (event.isAnchorSpawn() && !Config.overrideAnchorRespawnLocation) {
             return;
         }
 

src/main/resources/config.yml

@@ -5,3 +5,4 @@ database-password: "password"
 
 server-name: "default"
 override-bed-respawn-location: false
+override-anchor-respawn-location: false

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: FluffyTeams
 main: fr.fluffevent.fluffyteams.FluffyTeams
-version: 0.1.0-SNAPSHOT
+version: 0.1.1-SNAPSHOT
 api-version: 1.21
 author: FluffEvent
 authors: [lululombard]