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

16
src/main/java/net/server/channel/handlers/FamilyUseHandler.java
View File

@@ -31,7 +31,7 @@ import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import server.maps.FieldLimit;
import server.maps.MapleMap;
import tools.MaplePacketCreator;
import tools.PacketCreator;
import tools.data.input.SeekableLittleEndianAccessor;
/**
@@ -51,7 +51,7 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler {
if(entry.getReputation() < cost || entry.isEntitlementUsed(type)) {
return; // shouldn't even be able to request it
}
c.announce(MaplePacketCreator.getFamilyInfo(entry));
c.announce(PacketCreator.getFamilyInfo(entry));
MapleCharacter victim;
if(type == MapleFamilyEntitlement.FAMILY_REUINION || type == MapleFamilyEntitlement.SUMMON_FAMILY) {
victim = c.getChannelServer().getPlayerStorage().getCharacterByName(slea.readMapleAsciiString());
@@ -67,7 +67,7 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler {
c.getPlayer().changeMap(victim.getMap(), victim.getMap().getPortal(0));
useEntitlement(entry, type);
} else {
c.announce(MaplePacketCreator.sendFamilyMessage(75, 0)); // wrong message, but close enough. (client should check this first anyway)
c.announce(PacketCreator.sendFamilyMessage(75, 0)); // wrong message, but close enough. (client should check this first anyway)
return;
}
} else {
@@ -75,20 +75,20 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler {
&& (ownMap.getForcedReturnId() == 999999999 || ownMap.getId() < 100000000) && ownMap.getEventInstance() == null) {
if(MapleInviteCoordinator.hasInvite(InviteType.FAMILY_SUMMON, victim.getId())) {
c.announce(MaplePacketCreator.sendFamilyMessage(74, 0));
c.announce(PacketCreator.sendFamilyMessage(74, 0));
return;
}
MapleInviteCoordinator.createInvite(InviteType.FAMILY_SUMMON, c.getPlayer(), victim, victim.getId(), c.getPlayer().getMap());
victim.announce(MaplePacketCreator.sendFamilySummonRequest(c.getPlayer().getFamily().getName(), c.getPlayer().getName()));
victim.announce(PacketCreator.sendFamilySummonRequest(c.getPlayer().getFamily().getName(), c.getPlayer().getName()));
useEntitlement(entry, type);
} else {
c.announce(MaplePacketCreator.sendFamilyMessage(75, 0));
c.announce(PacketCreator.sendFamilyMessage(75, 0));
return;
}
}
}
} else {
c.announce(MaplePacketCreator.sendFamilyMessage(67, 0));
c.announce(PacketCreator.sendFamilyMessage(67, 0));
}
}
} else if(type == MapleFamilyEntitlement.FAMILY_BONDING) {
@@ -133,7 +133,7 @@ public final class FamilyUseHandler extends AbstractMaplePacketHandler {
private boolean useEntitlement(MapleFamilyEntry entry, MapleFamilyEntitlement entitlement) {
if(entry.useEntitlement(entitlement)) {
entry.gainReputation(-entitlement.getRepCost(), false);
entry.getChr().announce(MaplePacketCreator.getFamilyInfo(entry));
entry.getChr().announce(PacketCreator.getFamilyInfo(entry));
return true;
}
return false;