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

Rename InviteResult and MapleInviteResult

Browse Source
This commit is contained in:
P0nk
2021-09-09 23:04:02 +02:00
parent 8162d0aacd
commit 8f0bdb3c6d
10 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/server/channel/handlers/AcceptFamilyHandler.java
View File

@@ -30,8 +30,8 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.coordinator.world.InviteCoordinator;
import net.server.coordinator.world.InviteCoordinator.InviteResult;
import net.server.coordinator.world.InviteCoordinator.InviteResultType;
import net.server.coordinator.world.InviteCoordinator.InviteType;
import net.server.coordinator.world.InviteCoordinator.MapleInviteResult;
import tools.DatabaseConnection;
import tools.FilePrinter;
import tools.PacketCreator;
@@ -59,8 +59,8 @@ public final class AcceptFamilyHandler extends AbstractPacketHandler {
// String inviterName = slea.readMapleAsciiString();
Character inviter = c.getWorldServer().getPlayerStorage().getCharacterById(inviterId);
if(inviter != null) {
MapleInviteResult inviteResult = InviteCoordinator.answerInvite(InviteType.FAMILY, c.getPlayer().getId(), c.getPlayer(), accept);
if(inviteResult.result == InviteResult.NOT_FOUND) return; //was never invited. (or expired on server only somehow?)
InviteResult inviteResult = InviteCoordinator.answerInvite(InviteType.FAMILY, c.getPlayer().getId(), c.getPlayer(), accept);
if(inviteResult.result == InviteResultType.NOT_FOUND) return; //was never invited. (or expired on server only somehow?)
if(accept) {
if(inviter.getFamily() != null) {
if(chr.getFamily() == null) {

4
src/main/java/net/server/channel/handlers/DenyPartyRequestHandler.java
View File

@@ -26,7 +26,7 @@ import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.coordinator.world.InviteCoordinator;
import net.server.coordinator.world.InviteCoordinator.InviteResult;
import net.server.coordinator.world.InviteCoordinator.InviteResultType;
import net.server.coordinator.world.InviteCoordinator.InviteType;
import tools.PacketCreator;
@@ -41,7 +41,7 @@ public final class DenyPartyRequestHandler extends AbstractPacketHandler {
if (cfrom != null) {
Character chr = c.getPlayer();
if (InviteCoordinator.answerInvite(InviteType.PARTY, chr.getId(), cfrom.getPartyId(), false).result == InviteResult.DENIED) {
if (InviteCoordinator.answerInvite(InviteType.PARTY, chr.getId(), cfrom.getPartyId(), false).result == InviteResultType.DENIED) {
chr.updatePartySearchAvailability(chr.getParty() == null);
cfrom.sendPacket(PacketCreator.partyStatusMessage(23, chr.getName()));
}

6
src/main/java/net/server/channel/handlers/FamilySummonResponseHandler.java
View File

@@ -9,8 +9,8 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.coordinator.world.InviteCoordinator;
import net.server.coordinator.world.InviteCoordinator.InviteResult;
import net.server.coordinator.world.InviteCoordinator.InviteResultType;
import net.server.coordinator.world.InviteCoordinator.InviteType;
import net.server.coordinator.world.InviteCoordinator.MapleInviteResult;
import server.maps.MapleMap;
import tools.PacketCreator;
@@ -21,8 +21,8 @@ public class FamilySummonResponseHandler extends AbstractPacketHandler {
if(!YamlConfig.config.server.USE_FAMILY_SYSTEM) return;
p.readString(); //family name
boolean accept = p.readByte() != 0;
MapleInviteResult inviteResult = InviteCoordinator.answerInvite(InviteType.FAMILY_SUMMON, c.getPlayer().getId(), c.getPlayer(), accept);
if(inviteResult.result == InviteResult.NOT_FOUND) return;
InviteResult inviteResult = InviteCoordinator.answerInvite(InviteType.FAMILY_SUMMON, c.getPlayer().getId(), c.getPlayer(), accept);
if(inviteResult.result == InviteResultType.NOT_FOUND) return;
Character inviter = inviteResult.from;
FamilyEntry inviterEntry = inviter.getFamilyEntry();
if(inviterEntry == null) return;

8
src/main/java/net/server/channel/handlers/MessengerHandler.java
View File

@@ -27,8 +27,8 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.coordinator.world.InviteCoordinator;
import net.server.coordinator.world.InviteCoordinator.InviteResult;
import net.server.coordinator.world.InviteCoordinator.InviteResultType;
import net.server.coordinator.world.InviteCoordinator.InviteType;
import net.server.coordinator.world.InviteCoordinator.MapleInviteResult;
import net.server.world.Messenger;
import net.server.world.MessengerCharacter;
import net.server.world.World;
@@ -58,9 +58,9 @@ public final class MessengerHandler extends AbstractPacketHandler {
} else {
messenger = world.getMessenger(messengerid);
if (messenger != null) {
MapleInviteResult inviteRes = InviteCoordinator.answerInvite(InviteType.MESSENGER, player.getId(), messengerid, true);
InviteResult res = inviteRes.result;
if (res == InviteResult.ACCEPTED) {
InviteResult inviteRes = InviteCoordinator.answerInvite(InviteType.MESSENGER, player.getId(), messengerid, true);
InviteResultType res = inviteRes.result;
if (res == InviteResultType.ACCEPTED) {
int position = messenger.getLowestPosition();
MessengerCharacter messengerplayer = new MessengerCharacter(player, position);
if (messenger.getMembers().size() < 3) {

8
src/main/java/net/server/channel/handlers/PartyOperationHandler.java
View File

@@ -28,8 +28,8 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.coordinator.world.InviteCoordinator;
import net.server.coordinator.world.InviteCoordinator.InviteResult;
import net.server.coordinator.world.InviteCoordinator.InviteResultType;
import net.server.coordinator.world.InviteCoordinator.InviteType;
import net.server.coordinator.world.InviteCoordinator.MapleInviteResult;
import net.server.world.Party;
import net.server.world.PartyCharacter;
import net.server.world.PartyOperation;
@@ -64,9 +64,9 @@ public final class PartyOperationHandler extends AbstractPacketHandler {
case 3: { // join
int partyid = p.readInt();
MapleInviteResult inviteRes = InviteCoordinator.answerInvite(InviteType.PARTY, player.getId(), partyid, true);
InviteResult res = inviteRes.result;
if (res == InviteResult.ACCEPTED) {
InviteResult inviteRes = InviteCoordinator.answerInvite(InviteType.PARTY, player.getId(), partyid, true);
InviteResultType res = inviteRes.result;
if (res == InviteResultType.ACCEPTED) {
Party.joinParty(player, partyid, false);
} else {
c.sendPacket(PacketCreator.serverNotice(5, "You couldn't join the party due to an expired invitation request."));