Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-18 06:21:24 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' into hyper-optimization

Browse Source
This commit is contained in:
KingRainbow44
2023-09-16 19:01:43 -04:00
Unverified
parent a90a81c705 30f7580184
commit 3d2e0d0451
105 changed files with 1945 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/game/player/TeamManager.java
+1 -4
View File
@@ -800,10 +800,7 @@ public final class TeamManager extends BasePlayerDataManager {
public void onAvatarDie(long dieGuid) {
EntityAvatar deadAvatar = this.getCurrentAvatarEntity();
if (deadAvatar.isAlive() || deadAvatar.getId() != dieGuid) {
return;
}
if (deadAvatar == null || deadAvatar.getId() != dieGuid) return;
PlayerDieType dieType = deadAvatar.getKilledType();
int killedBy = deadAvatar.getKilledBy();