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

Rename and clean up MapleInviteCoordinator

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:31:58 +02:00
parent aea3a7921d
commit 4c803b62a8
15 changed files with 97 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/server/guild/MapleAlliance.java
View File

@@ -25,9 +25,9 @@ import client.Character;
import client.Client;
import net.packet.Packet;
import net.server.Server;
import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult;
import net.server.coordinator.world.InviteCoordinator;
import net.server.coordinator.world.InviteCoordinator.InviteType;
import net.server.coordinator.world.InviteCoordinator.MapleInviteResult;
import net.server.world.MapleParty;
import net.server.world.MaplePartyCharacter;
import tools.DatabaseConnection;
@@ -447,7 +447,7 @@ public class MapleAlliance {
if (victim == null) {
c.getPlayer().dropMessage(5, "The master of the guild that you offered an invitation is currently not online.");
} else {
if (MapleInviteCoordinator.createInvite(InviteType.ALLIANCE, c.getPlayer(), allianceId, victim.getId())) {
if (InviteCoordinator.createInvite(InviteType.ALLIANCE, c.getPlayer(), allianceId, victim.getId())) {
victim.sendPacket(GuildPackets.allianceInvite(allianceId, c.getPlayer()));
} else {
c.getPlayer().dropMessage(5, "The master of the guild that you offered an invitation is currently managing another invite.");
@@ -458,7 +458,7 @@ public class MapleAlliance {
}
public static boolean answerInvitation(int targetId, String targetGuildName, int allianceId, boolean answer) {
MapleInviteResult res = MapleInviteCoordinator.answerInvite(InviteType.ALLIANCE, targetId, allianceId, answer);
MapleInviteResult res = InviteCoordinator.answerInvite(InviteType.ALLIANCE, targetId, allianceId, answer);
String msg;
Character sender = res.from;

10
src/main/java/net/server/guild/MapleGuild.java
View File

@@ -31,9 +31,9 @@ import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.channel.Channel;
import net.server.coordinator.matchchecker.MatchCheckerCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator;
import net.server.coordinator.world.MapleInviteCoordinator.InviteType;
import net.server.coordinator.world.MapleInviteCoordinator.MapleInviteResult;
import net.server.coordinator.world.InviteCoordinator;
import net.server.coordinator.world.InviteCoordinator.InviteType;
import net.server.coordinator.world.InviteCoordinator.MapleInviteResult;
import tools.DatabaseConnection;
import tools.PacketCreator;
@@ -717,7 +717,7 @@ public class MapleGuild {
}
Character sender = c.getPlayer();
if (MapleInviteCoordinator.createInvite(InviteType.GUILD, sender, sender.getGuildId(), mc.getId())) {
if (InviteCoordinator.createInvite(InviteType.GUILD, sender, sender.getGuildId(), mc.getId())) {
mc.sendPacket(GuildPackets.guildInvite(sender.getGuildId(), sender.getName()));
return null;
} else {
@@ -726,7 +726,7 @@ public class MapleGuild {
}
public static boolean answerInvitation(int targetId, String targetName, int guildId, boolean answer) {
MapleInviteResult res = MapleInviteCoordinator.answerInvite(InviteType.GUILD, targetId, guildId, answer);
MapleInviteResult res = InviteCoordinator.answerInvite(InviteType.GUILD, targetId, guildId, answer);
MapleGuildResponse mgr;
Character sender = res.from;