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

Remove "Maple" prefix from MaplePacketCreator name

Browse Source
This commit is contained in:
P0nk
2021-08-19 21:31:57 +02:00
parent 579e3c639f
commit e184f25184
307 changed files with 2285 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/server/partyquest/AriantColiseum.java
View File

@@ -25,7 +25,7 @@ import server.TimerManager;
import server.expeditions.MapleExpedition;
import server.expeditions.MapleExpeditionType;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.ArrayList;
import java.util.HashMap;
@@ -76,7 +76,7 @@ public class AriantColiseum {
}
for (MapleCharacter mc : players) {
mc.announce(MaplePacketCreator.updateAriantPQRanking(score));
mc.announce(PacketCreator.updateAriantPQRanking(score));
}
setAriantScoreBoard(TimerManager.getInstance().schedule(() -> showArenaResults(), pqTimerBoard));
@@ -144,7 +144,7 @@ public class AriantColiseum {
private void broadcastAriantScoreUpdate() {
if (scoreDirty) {
for (MapleCharacter chr : score.keySet()) {
chr.announce(MaplePacketCreator.updateAriantPQRanking(score));
chr.announce(PacketCreator.updateAriantPQRanking(score));
}
scoreDirty = false;
}
@@ -193,7 +193,7 @@ public class AriantColiseum {
eventClear = true;
if (map != null) {
map.broadcastMessage(MaplePacketCreator.showAriantScoreBoard());
map.broadcastMessage(PacketCreator.showAriantScoreBoard());
map.killAllMonsters();
distributeAriantPoints();

20
src/main/java/server/partyquest/MonsterCarnival.java
View File

@@ -10,7 +10,7 @@ import net.server.world.MaplePartyCharacter;
import server.TimerManager;
import server.maps.MapleMap;
import server.maps.MapleReactor;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.concurrent.ScheduledFuture;
@@ -346,7 +346,7 @@ public class MonsterCarnival {
}
startTime = System.currentTimeMillis() + 3 * 60 * 1000;
map.broadcastMessage(MaplePacketCreator.getClock(3 * 60));
map.broadcastMessage(PacketCreator.getClock(3 * 60));
timer = TimerManager.getInstance().schedule(() -> timeUp(), map.getTimeExpand() * 1000);
effectTimer = TimerManager.getInstance().schedule(() -> complete(), map.getTimeExpand() * 1000 - 10 * 1000); // thanks Vcoc for noticing a time set issue here
@@ -374,12 +374,12 @@ public class MonsterCarnival {
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
if (redWin) {
mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/win"));
mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Win"));
mc.getClient().announce(PacketCreator.showEffect("quest/carnival/win"));
mc.getClient().announce(PacketCreator.playSound("MobCarnival/Win"));
mc.dispelDebuffs();
} else {
mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/lose"));
mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Lose"));
mc.getClient().announce(PacketCreator.showEffect("quest/carnival/lose"));
mc.getClient().announce(PacketCreator.playSound("MobCarnival/Lose"));
mc.dispelDebuffs();
}
}
@@ -388,12 +388,12 @@ public class MonsterCarnival {
MapleCharacter mc = mpc.getPlayer();
if (mc != null) {
if (!redWin) {
mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/win"));
mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Win"));
mc.getClient().announce(PacketCreator.showEffect("quest/carnival/win"));
mc.getClient().announce(PacketCreator.playSound("MobCarnival/Win"));
mc.dispelDebuffs();
} else {
mc.getClient().announce(MaplePacketCreator.showEffect("quest/carnival/lose"));
mc.getClient().announce(MaplePacketCreator.playSound("MobCarnival/Lose"));
mc.getClient().announce(PacketCreator.showEffect("quest/carnival/lose"));
mc.getClient().announce(PacketCreator.playSound("MobCarnival/Lose"));
mc.dispelDebuffs();
}
}

7
src/main/java/server/partyquest/MonsterCarnivalParty.java
View File

@@ -1,10 +1,11 @@
package server.partyquest;
import client.MapleCharacter;
import server.maps.MapleMap;
import tools.PacketCreator;
import java.util.LinkedList;
import java.util.List;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
/**
* @author Rob
@@ -111,7 +112,7 @@ public class MonsterCarnivalParty {
final String effect = winner ? "quest/carnival/win" : "quest/carnival/lose";
for (final MapleCharacter chr : members) {
chr.announce(MaplePacketCreator.showEffect(effect));
chr.announce(PacketCreator.showEffect(effect));
}
}

14
src/main/java/server/partyquest/Pyramid.java
View File

@@ -26,7 +26,7 @@ import client.MapleCharacter;
import net.server.world.MapleParty;
import server.MapleItemInformationProvider;
import server.TimerManager;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import java.util.concurrent.ScheduledFuture;
@@ -151,8 +151,8 @@ public class Pyramid extends PartyQuest {
public void broadcastInfo(String info, int amount) {
for (MapleCharacter chr : getParticipants()) {
chr.announce(MaplePacketCreator.getEnergy("massacre_" + info, amount));
chr.announce(MaplePacketCreator.pyramidGauge(count));
chr.announce(PacketCreator.getEnergy("massacre_" + info, amount));
chr.announce(PacketCreator.pyramidGauge(count));
}
}
@@ -177,7 +177,7 @@ public class Pyramid extends PartyQuest {
skill++;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for (MapleCharacter chr : getParticipants()) {
chr.announce(MaplePacketCreator.getEnergy("massacre_skill", skill));
chr.announce(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022586).applyTo(chr);
}
} else if (buffcount == 2 && total >= 1000) {
@@ -185,7 +185,7 @@ public class Pyramid extends PartyQuest {
skill++;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for (MapleCharacter chr : getParticipants()) {
chr.announce(MaplePacketCreator.getEnergy("massacre_skill", skill));
chr.announce(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022587).applyTo(chr);
}
} else if (buffcount == 3 && total >= 1500) {
@@ -196,7 +196,7 @@ public class Pyramid extends PartyQuest {
skill++;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
for (MapleCharacter chr : getParticipants()) {
chr.announce(MaplePacketCreator.getEnergy("massacre_skill", skill));
chr.announce(PacketCreator.getEnergy("massacre_skill", skill));
ii.getItemEffect(2022588).applyTo(chr);
}
} else if (buffcount == 5 && total >= 2500) {
@@ -229,7 +229,7 @@ public class Pyramid extends PartyQuest {
exp += ((kill * 2) + (cool * 10));
}
chr.announce(MaplePacketCreator.pyramidScore(rank, exp));
chr.announce(PacketCreator.pyramidScore(rank, exp));
chr.gainExp(exp, true, true);
}
}