Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleCarnivalFactory

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:56:50 +02:00
parent 2afec0bcda
commit 820de42257
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/server/maps/MapleMap.java
View File

@@ -59,9 +59,9 @@ import server.TimerManager;
import server.events.gm.*;
import server.life.*;
import server.life.LifeFactory.selfDestruction;
import server.partyquest.CarnivalFactory;
import server.partyquest.CarnivalFactory.MCSkill;
import server.partyquest.GuardianSpawnPoint;
import server.partyquest.MapleCarnivalFactory;
import server.partyquest.MapleCarnivalFactory.MCSkill;
import tools.FilePrinter;
import tools.PacketCreator;
import tools.Pair;
@@ -4288,7 +4288,7 @@ public class MapleMap {
if (team == 0 && redTeamBuffs.size() >= 4 || team == 1 && blueTeamBuffs.size() >= 4) {
return 2;
}
final MCSkill skill = MapleCarnivalFactory.getInstance().getGuardian(num);
final MCSkill skill = CarnivalFactory.getInstance().getGuardian(num);
if (team == 0 && redTeamBuffs.contains(skill)) {
return 0;
} else if (team == 1 && blueTeamBuffs.contains(skill)) {