From 250a192b30f2ad0edf73bf8aeb8b9f55f8a745ed Mon Sep 17 00:00:00 2001
From: Melledy <52122272+Melledy@users.noreply.github.com>
Date: Fri, 24 Jun 2022 07:43:43 -0700
Subject: [PATCH] Random cleanups in the gameserver and player

---
 .../game/battlepass/BattlePassManager.java    |  2 +-
 .../emu/grasscutter/game/player/Player.java   |  4 -
 .../grasscutter/server/game/GameServer.java   | 78 ++++---------------
 3 files changed, 14 insertions(+), 70 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java b/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java
index fab94557d..5a8a8390c 100644
--- a/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java
+++ b/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java
@@ -177,7 +177,7 @@ public class BattlePassManager {
 			
 			// Take reward
 			if (mission.getStatus() == BattlePassMissionStatus.MISSION_STATUS_FINISHED) {
-				this.addPointsDirectly(mission.getData().getAddPoint(), mission.getData().getRefreshType() == BattlePassMissionRefreshType.BATTLE_PASS_MISSION_REFRESH_CYCLE_CROSS_SCHEDULE);
+				this.addPointsDirectly(mission.getData().getAddPoint(), mission.getData().isCycleRefresh());
 				mission.setStatus(BattlePassMissionStatus.MISSION_STATUS_POINT_TAKEN);
 				
 				updatedMissions.add(mission);
diff --git a/src/main/java/emu/grasscutter/game/player/Player.java b/src/main/java/emu/grasscutter/game/player/Player.java
index f883d27a6..932148c9d 100644
--- a/src/main/java/emu/grasscutter/game/player/Player.java
+++ b/src/main/java/emu/grasscutter/game/player/Player.java
@@ -1483,10 +1483,6 @@ public class Player {
 
 			// Call quit event.
 			PlayerQuitEvent event = new PlayerQuitEvent(this); event.call();
-
-			//reset wood
-			getDeforestationManager().resetWood();
-
 		}catch (Throwable e){
 			e.printStackTrace();
 			Grasscutter.getLogger().warn("Player (UID {}) save failure", getUid());
diff --git a/src/main/java/emu/grasscutter/server/game/GameServer.java b/src/main/java/emu/grasscutter/server/game/GameServer.java
index 4ae5c8549..2eeb00fca 100644
--- a/src/main/java/emu/grasscutter/server/game/GameServer.java
+++ b/src/main/java/emu/grasscutter/server/game/GameServer.java
@@ -52,20 +52,19 @@ public final class GameServer extends KcpServer {
 	private final Set<World> worlds;
 
 	private ChatManagerHandler chatManager;
-	private final InventoryManager inventoryManager;
-	private final GachaManager gachaManager;
-	private final ShopManager shopManager;
-	private final MultiplayerManager multiplayerManager;
-	private final DungeonManager dungeonManager;
-	private final ExpeditionManager expeditionManager;
-	private final CommandMap commandMap;
-	private final TaskMap taskMap;
-	private final DropManager dropManager;
-	private final WorldDataManager worldDataManager;
-	private final BattlePassMissionManager battlePassMissionManager;
-
-	private final CombineManger combineManger;
-	private final TowerScheduleManager towerScheduleManager;
+	@Getter private final InventoryManager inventoryManager;
+	@Getter private final GachaManager gachaManager;
+	@Getter private final ShopManager shopManager;
+	@Getter private final MultiplayerManager multiplayerManager;
+	@Getter private final DungeonManager dungeonManager;
+	@Getter private final ExpeditionManager expeditionManager;
+	@Getter private final CommandMap commandMap;
+	@Getter private final TaskMap taskMap;
+	@Getter private final DropManager dropManager;
+	@Getter private final WorldDataManager worldDataManager;
+	@Getter private final BattlePassMissionManager battlePassMissionManager;
+	@Getter private final CombineManger combineManger;
+	@Getter private final TowerScheduleManager towerScheduleManager;
 
 	public GameServer() {
 		this(getAdapterInetSocketAddress());
@@ -133,57 +132,6 @@ public final class GameServer extends KcpServer {
 		this.chatManager = chatManager;
 	}
 
-	public InventoryManager getInventoryManager() {
-		return inventoryManager;
-	}
-
-	public GachaManager getGachaManager() {
-		return gachaManager;
-	}
-
-	public ShopManager getShopManager() {
-		return shopManager;
-	}
-
-	public MultiplayerManager getMultiplayerManager() {
-		return multiplayerManager;
-	}
-
-	public DropManager getDropManager() {
-		return dropManager;
-	}
-
-	public DungeonManager getDungeonManager() {
-		return dungeonManager;
-	}
-
-	public ExpeditionManager getExpeditionManager() {
-		return expeditionManager;
-	}
-
-	public CommandMap getCommandMap() {
-		return this.commandMap;
-	}
-
-	public CombineManger getCombineManger(){
-		return this.combineManger;
-	}
-
-	public TowerScheduleManager getTowerScheduleManager() {
-		return towerScheduleManager;
-	}
-
-	public WorldDataManager getWorldDataManager() {
-		return worldDataManager;
-	}
-
-	public BattlePassMissionManager getBattlePassMissionManager() {
-		return battlePassMissionManager;
-	}
-
-	public TaskMap getTaskMap() {
-		return this.taskMap;
-	}
 
 	private static InetSocketAddress getAdapterInetSocketAddress(){
 		InetSocketAddress inetSocketAddress;