Sweetgum/sweetgum-server
1
0
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

52
src/main/java/server/life/MapleMonster.java
View File

@@ -48,7 +48,7 @@ import server.maps.MapleMap;
import server.maps.MapleMapObjectType;
import server.maps.MapleSummon;
import tools.IntervalBuilder;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.Pair;
import tools.Randomizer;
@@ -365,7 +365,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
from.getMap().broadcastBossHpMessage(this, this.hashCode(), makeBossHPBarPacket(), getPosition());
} else if (!isBoss()) {
int remainingHP = (int) Math.max(1, hp.get() * 100f / getMaxHp());
byte[] packet = MaplePacketCreator.showMonsterHP(getObjectId(), remainingHP);
byte[] packet = PacketCreator.showMonsterHP(getObjectId(), remainingHP);
if (from.getParty() != null) {
for (MaplePartyCharacter mpc : from.getParty().getMembers()) {
MapleCharacter member = from.getMap().getCharacterById(mpc.getId()); // god bless
@@ -471,7 +471,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
setMp(mp2Heal);
if (hp > 0) {
getMap().broadcastMessage(MaplePacketCreator.healMonster(getObjectId(), hp, getHp(), getMaxHp()));
getMap().broadcastMessage(PacketCreator.healMonster(getObjectId(), hp, getHp(), getMaxHp()));
}
maxHpPlusHeal.addAndGet(hpHealed);
@@ -758,13 +758,13 @@ public class MapleMonster extends AbstractLoadedMapleLife {
if (toSpawn != null) {
final MapleMap reviveMap = map;
if (toSpawn.contains(9300216) && reviveMap.getId() > 925000000 && reviveMap.getId() < 926000000) {
reviveMap.broadcastMessage(MaplePacketCreator.playSound("Dojang/clear"));
reviveMap.broadcastMessage(MaplePacketCreator.showEffect("dojang/end/clear"));
reviveMap.broadcastMessage(PacketCreator.playSound("Dojang/clear"));
reviveMap.broadcastMessage(PacketCreator.showEffect("dojang/end/clear"));
}
Pair<Integer, String> timeMob = reviveMap.getTimeMob();
if (timeMob != null) {
if (toSpawn.contains(timeMob.getLeft())) {
reviveMap.broadcastMessage(MaplePacketCreator.serverNotice(6, timeMob.getRight()));
reviveMap.broadcastMessage(PacketCreator.serverNotice(6, timeMob.getRight()));
}
}
@@ -1006,7 +1006,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
public byte[] makeBossHPBarPacket() {
return MaplePacketCreator.showBossHP(getId(), getHp(), getMaxHp(), getTagColor(), getTagBgColor());
return PacketCreator.showBossHP(getId(), getHp(), getMaxHp(), getTagColor(), getTagBgColor());
}
public boolean hasBossHPBar() {
@@ -1019,9 +1019,9 @@ public class MapleMonster extends AbstractLoadedMapleLife {
return;
}
if (fake) {
client.announce(MaplePacketCreator.spawnFakeMonster(this, 0));
client.announce(PacketCreator.spawnFakeMonster(this, 0));
} else {
client.announce(MaplePacketCreator.spawnMonster(this, false));
client.announce(PacketCreator.spawnMonster(this, false));
}
if (hasBossHPBar()) {
@@ -1031,8 +1031,8 @@ public class MapleMonster extends AbstractLoadedMapleLife {
@Override
public void sendDestroyData(MapleClient client) {
client.announce(MaplePacketCreator.killMonster(getObjectId(), false));
client.announce(MaplePacketCreator.killMonster(getObjectId(), true));
client.announce(PacketCreator.killMonster(getObjectId(), false));
client.announce(PacketCreator.killMonster(getObjectId(), true));
}
@Override
@@ -1097,7 +1097,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
private int broadcastStatusEffect(final MonsterStatusEffect status) {
int animationTime = status.getSkill().getAnimationTime();
byte[] packet = MaplePacketCreator.applyMonsterStatus(getObjectId(), status, null);
byte[] packet = PacketCreator.applyMonsterStatus(getObjectId(), status, null);
broadcastMonsterStatusMessage(packet);
return animationTime;
@@ -1172,7 +1172,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
final Runnable cancelTask = () -> {
if (isAlive()) {
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), status.getStati());
byte[] packet = PacketCreator.cancelMonsterStatus(getObjectId(), status.getStati());
broadcastMonsterStatusMessage(packet);
}
@@ -1284,7 +1284,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
public void applyMonsterBuff(final Map<MonsterStatus, Integer> stats, final int x, int skillId, long duration, MobSkill skill, final List<Integer> reflection) {
final Runnable cancelTask = () -> {
if (isAlive()) {
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), stats);
byte[] packet = PacketCreator.cancelMonsterStatus(getObjectId(), stats);
broadcastMonsterStatusMessage(packet);
statiLock.lock();
@@ -1298,7 +1298,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
};
final MonsterStatusEffect effect = new MonsterStatusEffect(stats, null, skill, true);
byte[] packet = MaplePacketCreator.applyMonsterStatus(getObjectId(), effect, reflection);
byte[] packet = PacketCreator.applyMonsterStatus(getObjectId(), effect, reflection);
broadcastMonsterStatusMessage(packet);
statiLock.lock();
@@ -1323,7 +1323,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
aggroRemoveController();
setPosition(newPoint);
map.broadcastMessage(MaplePacketCreator.moveMonster(this.getObjectId(), false, -1, 0, 0, 0, this.getPosition(), this.getIdleMovement(), getIdleMovementDataLength()));
map.broadcastMessage(PacketCreator.moveMonster(this.getObjectId(), false, -1, 0, 0, 0, this.getPosition(), this.getIdleMovement(), getIdleMovementDataLength()));
map.moveMonster(this, this.getPosition());
aggroUpdateController();
@@ -1339,7 +1339,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
if (oldEffect != null) {
byte[] packet = MaplePacketCreator.cancelMonsterStatus(getObjectId(), oldEffect.getStati());
byte[] packet = PacketCreator.cancelMonsterStatus(getObjectId(), oldEffect.getStati());
broadcastMonsterStatusMessage(packet);
}
}
@@ -1639,10 +1639,10 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
if (type == 1) {
map.broadcastMessage(MaplePacketCreator.damageMonster(getObjectId(), damage), getPosition());
map.broadcastMessage(PacketCreator.damageMonster(getObjectId(), damage), getPosition());
} else if (type == 2) {
if(damage < dealDamage) { // ninja ambush (type 2) is already displaying DOT to the caster
map.broadcastMessage(MaplePacketCreator.damageMonster(getObjectId(), damage), getPosition());
map.broadcastMessage(PacketCreator.damageMonster(getObjectId(), damage), getPosition());
}
}
}
@@ -1884,7 +1884,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
if (chrController != null) { // this can/should only happen when a hidden gm attacks the monster
if (!this.isFake()) chrController.announce(MaplePacketCreator.stopControllingMonster(this.getObjectId()));
if (!this.isFake()) chrController.announce(PacketCreator.stopControllingMonster(this.getObjectId()));
chrController.stopControllingMonster(this);
}
@@ -2088,7 +2088,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
Maybe Nexon intended to interchange controllers at every attack...
else if (chrController != null) {
chrController.announce(MaplePacketCreator.stopControllingMonster(this.getObjectId()));
chrController.announce(PacketCreator.stopControllingMonster(this.getObjectId()));
aggroMonsterControl(chrController.getClient(), this, true);
}
*/
@@ -2099,7 +2099,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
private static void aggroMonsterControl(MapleClient c, MapleMonster mob, boolean immediateAggro) {
c.announce(MaplePacketCreator.controlMonster(mob, false, immediateAggro));
c.announce(PacketCreator.controlMonster(mob, false, immediateAggro));
}
private void aggroRefreshPuppetVisibility(MapleCharacter chrController, MapleSummon puppet) {
@@ -2113,15 +2113,15 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
for (MapleMonster mob : puppetControlled) {
chrController.announce(MaplePacketCreator.stopControllingMonster(mob.getObjectId()));
chrController.announce(PacketCreator.stopControllingMonster(mob.getObjectId()));
}
chrController.announce(MaplePacketCreator.removeSummon(puppet, false));
chrController.announce(PacketCreator.removeSummon(puppet, false));
MapleClient c = chrController.getClient();
for (MapleMonster mob : puppetControlled) { // thanks BHB for noticing puppets disrupting mobstatuses for bowmans
aggroMonsterControl(c, mob, mob.isControllerKnowsAboutAggro());
}
chrController.announce(MaplePacketCreator.spawnSummon(puppet, false));
chrController.announce(PacketCreator.spawnSummon(puppet, false));
}
public void aggroUpdatePuppetVisibility() {
@@ -2151,7 +2151,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
if (controllerHasPuppet) {
controllerHasPuppet = false;
chrController.announce(MaplePacketCreator.stopControllingMonster(MapleMonster.this.getObjectId()));
chrController.announce(PacketCreator.stopControllingMonster(MapleMonster.this.getObjectId()));
aggroMonsterControl(chrController.getClient(), MapleMonster.this, MapleMonster.this.isControllerHasAggro());
}
} finally {