Browse Source

Refactoring

RedstoneFuture 1 year ago
parent
commit
08278fb8e4

+ 0 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -31,7 +31,6 @@ import de.butzlabben.missilewars.game.enums.GameState;
 import de.butzlabben.missilewars.game.enums.MapChooseProcedure;
 import de.butzlabben.missilewars.game.enums.MapChooseProcedure;
 import de.butzlabben.missilewars.game.enums.VoteState;
 import de.butzlabben.missilewars.game.enums.VoteState;
 import de.butzlabben.missilewars.game.equipment.EquipmentManager;
 import de.butzlabben.missilewars.game.equipment.EquipmentManager;
-import de.butzlabben.missilewars.game.equipment.PlayerEquipmentRandomizer;
 import de.butzlabben.missilewars.game.misc.MotdManager;
 import de.butzlabben.missilewars.game.misc.MotdManager;
 import de.butzlabben.missilewars.game.misc.ScoreboardManager;
 import de.butzlabben.missilewars.game.misc.ScoreboardManager;
 import de.butzlabben.missilewars.game.schematics.SchematicFacing;
 import de.butzlabben.missilewars.game.schematics.SchematicFacing;

+ 1 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/game/GameListener.java

@@ -186,7 +186,7 @@ public class GameListener extends GameBoundListener {
             event.setRespawnLocation(team.getSpawn());
             event.setRespawnLocation(team.getSpawn());
             getGame().getEquipmentManager().sendGameItems(player, true);
             getGame().getEquipmentManager().sendGameItems(player, true);
             getGame().setPlayerAttributes(player);
             getGame().setPlayerAttributes(player);
-            getGame().getPlayer(player).getRandomGameEquipment().resetPlayerInterval();
+            getGame().getPlayer(player).getPlayerEquipmentRandomizer().resetPlayerInterval();
 
 
             FallProtectionConfiguration fallProtection = getGame().getArena().getFallProtection();
             FallProtectionConfiguration fallProtection = getGame().getArena().getFallProtection();
             if (fallProtection.isEnabled()) {
             if (fallProtection.isEnabled()) {

+ 7 - 4
missilewars-plugin/src/main/java/de/butzlabben/missilewars/player/MWPlayer.java

@@ -44,8 +44,7 @@ public class MWPlayer implements Runnable {
     private final Game game;
     private final Game game;
     @Setter
     @Setter
     private Team team;
     private Team team;
-    @Setter
-    private PlayerEquipmentRandomizer randomGameEquipment;
+    private PlayerEquipmentRandomizer playerEquipmentRandomizer;
     @Setter
     @Setter
     private boolean playerInteractEventCancel = false;
     private boolean playerInteractEventCancel = false;
 
 
@@ -57,10 +56,14 @@ public class MWPlayer implements Runnable {
     public Player getPlayer() {
     public Player getPlayer() {
         return Bukkit.getPlayer(uuid);
         return Bukkit.getPlayer(uuid);
     }
     }
-
+    
+    public void iniPlayerEquipmentRandomizer() {
+        this.playerEquipmentRandomizer = new PlayerEquipmentRandomizer(this, game);
+    }
+    
     @Override
     @Override
     public void run() {
     public void run() {
-        randomGameEquipment.tick();
+        playerEquipmentRandomizer.tick();
     }
     }
 
 
     @Override
     @Override