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

Rename and clean up MapleSummon

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:39:43 +02:00
parent 03dc665605
commit 8a95459a17
10 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2061,7 +2061,7 @@ public class MapleMap {
return doorPortal;
}
public void spawnSummon(final MapleSummon summon) {
public void spawnSummon(final Summon summon) {
spawnAndAddRangedMapObject(summon, c -> {
if (summon != null) {
c.sendPacket(PacketCreator.spawnSummon(summon, true));
@@ -2537,7 +2537,7 @@ public class MapleMap {
MapleStatEffect summonStat = chr.getStatForBuff(BuffStat.SUMMON);
if (summonStat != null) {
MapleSummon summon = chr.getSummonByKey(summonStat.getSourceId());
Summon summon = chr.getSummonByKey(summonStat.getSourceId());
summon.setPosition(chr.getPosition());
chr.getMap().spawnSummon(summon);
updateMapObjectVisibility(chr, summon);
@@ -2699,7 +2699,7 @@ public class MapleMap {
chr.leaveMap();
for (MapleSummon summon : new ArrayList<>(chr.getSummonsValues())) {
for (Summon summon : new ArrayList<>(chr.getSummonsValues())) {
if (summon.isStationary()) {
chr.cancelEffectFromBuffStat(BuffStat.PUPPET);
} else {
@@ -2939,7 +2939,7 @@ public class MapleMap {
if (isNonRangedType(o.getType())) {
o.sendSpawnData(c);
} else if (o.getType() == MapObjectType.SUMMON) {
MapleSummon summon = (MapleSummon) o;
Summon summon = (Summon) o;
if (summon.getOwner() == chr) {
if (chr.isSummonsEmpty() || !chr.containsSummon(summon)) {
objectWLock.lock();