Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
cdc23a06
Commit
cdc23a06
authored
Jun 24, 2022
by
Melledy
Browse files
Random cleanups in the gameserver and player
parent
a16bc721
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java
View file @
cdc23a06
...
...
@@ -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
);
...
...
src/main/java/emu/grasscutter/game/player/Player.java
View file @
cdc23a06
...
...
@@ -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
());
...
...
src/main/java/emu/grasscutter/server/game/GameServer.java
View file @
cdc23a06
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment