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

Rename and clean up MapleAlliance

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:33:36 +02:00
parent e75139e5e6
commit 5e5f7b12ca
11 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/server/channel/handlers/AllianceOperationHandler.java
View File

@@ -26,8 +26,8 @@ import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import net.server.guild.Alliance;
import net.server.guild.GuildPackets;
import net.server.guild.MapleAlliance;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter;
import tools.PacketCreator;
@@ -40,7 +40,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, Client c) {
MapleAlliance alliance = null;
Alliance alliance = null;
Character chr = c.getPlayer();
if (chr.getGuild() == null) {
@@ -81,7 +81,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
return;
}
MapleAlliance.removeGuildFromAlliance(chr.getGuild().getAllianceId(), chr.getGuildId(), chr.getWorld());
Alliance.removeGuildFromAlliance(chr.getGuild().getAllianceId(), chr.getGuildId(), chr.getWorld());
break;
}
case 0x03: // Send Invite
@@ -90,7 +90,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
if (alliance.getGuilds().size() == alliance.getCapacity()) {
chr.dropMessage(5, "Your alliance cannot comport any more guilds at the moment.");
} else {
MapleAlliance.sendInvitation(c, guildName, alliance.getId());
Alliance.sendInvitation(c, guildName, alliance.getId());
}
break;
@@ -108,7 +108,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
return;
}
if (!MapleAlliance.answerInvitation(c.getPlayer().getId(), guild.getName(), alliance.getId(), true)) {
if (!Alliance.answerInvitation(c.getPlayer().getId(), guild.getName(), alliance.getId(), true)) {
return;
}
@@ -200,7 +200,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
alliance.saveToDB();
}
private void changeLeaderAllianceRank(MapleAlliance alliance, Character newLeader) {
private void changeLeaderAllianceRank(Alliance alliance, Character newLeader) {
MapleGuildCharacter lmgc = alliance.getLeader();
Character leader = newLeader.getWorldServer().getPlayerStorage().getCharacterById(lmgc.getId());
leader.getMGC().setAllianceRank(2);
@@ -213,7 +213,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
alliance.dropMessage("'" + newLeader.getName() + "' has been appointed as the new head of this Alliance.");
}
private void changePlayerAllianceRank(MapleAlliance alliance, Character chr, boolean raise) {
private void changePlayerAllianceRank(Alliance alliance, Character chr, boolean raise) {
int newRank = chr.getAllianceRank() + (raise ? -1 : 1);
if(newRank < 3 || newRank > 5) return;

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

@@ -23,7 +23,7 @@ import client.Character;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.guild.MapleAlliance;
import net.server.guild.Alliance;
/**
* @author Ronan
@@ -38,9 +38,9 @@ public final class DenyAllianceRequestHandler extends AbstractPacketHandler {
Character chr = c.getWorldServer().getPlayerStorage().getCharacterByName(inviterName);
if (chr != null) {
MapleAlliance alliance = chr.getAlliance();
Alliance alliance = chr.getAlliance();
if (alliance != null) {
MapleAlliance.answerInvitation(c.getPlayer().getId(), guildName, alliance.getId(), false);
Alliance.answerInvitation(c.getPlayer().getId(), guildName, alliance.getId(), false);
}
}
}

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

@@ -29,8 +29,8 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType;
import net.server.guild.Alliance;
import net.server.guild.GuildPackets;
import net.server.guild.MapleAlliance;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildResponse;
import net.server.world.MapleParty;
@@ -224,7 +224,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
Server.getInstance().setGuildEmblem(mc.getGuildId(), bg, bgcolor, logo, logocolor);
if (mc.getGuild() != null && mc.getGuild().getAllianceId() > 0) {
MapleAlliance alliance = mc.getAlliance();
Alliance alliance = mc.getAlliance();
Server.getInstance().allianceMessage(alliance.getId(), GuildPackets.getGuildAlliances(alliance, c.getWorld()), -1, -1);
}

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

@@ -36,8 +36,8 @@ import net.server.channel.CharacterIdChannelPair;
import net.server.coordinator.session.Hwid;
import net.server.coordinator.session.SessionCoordinator;
import net.server.coordinator.world.EventRecallCoordinator;
import net.server.guild.Alliance;
import net.server.guild.GuildPackets;
import net.server.guild.MapleAlliance;
import net.server.guild.MapleGuild;
import net.server.world.MaplePartyCharacter;
import net.server.world.PartyOperation;
@@ -280,9 +280,9 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
c.sendPacket(GuildPackets.showGuildInfo(player));
int allianceId = player.getGuild().getAllianceId();
if (allianceId > 0) {
MapleAlliance newAlliance = server.getAlliance(allianceId);
Alliance newAlliance = server.getAlliance(allianceId);
if (newAlliance == null) {
newAlliance = MapleAlliance.loadAlliance(allianceId);
newAlliance = Alliance.loadAlliance(allianceId);
if (newAlliance != null) {
server.addAlliance(allianceId, newAlliance);
} else {