浏览代码

Remove version check < 1.13

RedstoneFuture 2 年之前
父节点
当前提交
22898e08fc

+ 5 - 7
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/misc/RespawnGoldBlock.java

@@ -23,10 +23,6 @@ import de.butzlabben.missilewars.configuration.Messages;
 import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.game.Game;
 import de.butzlabben.missilewars.game.enums.GameState;
 import de.butzlabben.missilewars.game.enums.GameState;
 import de.butzlabben.missilewars.util.version.BlockSetterProvider;
 import de.butzlabben.missilewars.util.version.BlockSetterProvider;
-import de.butzlabben.missilewars.util.version.VersionUtil;
-import java.util.AbstractMap;
-import java.util.HashMap;
-import java.util.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Location;
@@ -38,6 +34,10 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerToggleSneakEvent;
 import org.bukkit.event.player.PlayerToggleSneakEvent;
 
 
+import java.util.AbstractMap;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
 /**
  * @author Butzlabben
  * @author Butzlabben
  * @since 14.01.2018
  * @since 14.01.2018
@@ -112,9 +112,7 @@ public class RespawnGoldBlock implements Listener {
 
 
     private void setBlock(Block b) {
     private void setBlock(Block b) {
         if ((b.getType() != Material.GOLD_BLOCK) && (b.getType() == Material.AIR)) {
         if ((b.getType() != Material.GOLD_BLOCK) && (b.getType() == Material.AIR)) {
-            Object data = b.getData();
-            if (VersionUtil.getVersion() >= 13)
-                data = b.getBlockData();
+            Object data = b.getBlockData();
             map.put(b.getLocation(), new AbstractMap.SimpleEntry<>(b.getType(), data));
             map.put(b.getLocation(), new AbstractMap.SimpleEntry<>(b.getType(), data));
             b.setType(Material.GOLD_BLOCK);
             b.setType(Material.GOLD_BLOCK);
         }
         }

+ 8 - 16
missilewars-plugin/src/main/java/de/butzlabben/missilewars/player/PlayerData.java

@@ -19,13 +19,6 @@
 package de.butzlabben.missilewars.player;
 package de.butzlabben.missilewars.player;
 
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Preconditions;
-import de.butzlabben.missilewars.util.version.VersionUtil;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.ToString;
 import lombok.ToString;
 import org.bukkit.GameMode;
 import org.bukkit.GameMode;
@@ -35,6 +28,13 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NotNull;
 
 
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
 @ToString
 @ToString
 @AllArgsConstructor
 @AllArgsConstructor
 public class PlayerData implements ConfigurationSerializable {
 public class PlayerData implements ConfigurationSerializable {
@@ -76,15 +76,7 @@ public class PlayerData implements ConfigurationSerializable {
         Preconditions.checkArgument(file.isFile(), file.getAbsolutePath() + " is not a file");
         Preconditions.checkArgument(file.isFile(), file.getAbsolutePath() + " is not a file");
 
 
         YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(file);
         YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(file);
-        PlayerData data;
-
-        if (VersionUtil.getVersion() > 12) {
-            data = yamlConfiguration.getSerializable("data", PlayerData.class);
-        } else {
-            data = (PlayerData) yamlConfiguration.get("data");
-        }
-
-        return data;
+        return yamlConfiguration.getSerializable("data", PlayerData.class);
     }
     }
 
 
     public void apply(Player player) {
     public void apply(Player player) {