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

Rename and clean up MapleGuild

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:34:29 +02:00
parent 5e5f7b12ca
commit 559d3a42b3
18 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,8 +27,8 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import net.server.guild.Alliance;
import net.server.guild.Guild;
import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter;
import tools.PacketCreator;
@@ -95,7 +95,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
break;
case 0x04: { // Accept Invite
MapleGuild guild = chr.getGuild();
Guild guild = chr.getGuild();
if (guild.getAllianceId() != 0 || chr.getGuildRank() != 1 || chr.getGuildId() < 1) {
return;
}
@@ -123,7 +123,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
Server.getInstance().resetAllianceGuildPlayersRank(guildid);
chr.getMGC().setAllianceRank(2);
MapleGuild g = Server.getInstance().getGuild(chr.getGuildId());
Guild g = Server.getInstance().getGuild(chr.getGuildId());
if (g != null) {
g.getMGC(chr.getId()).setAllianceRank(2);
}

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

@@ -25,7 +25,7 @@ import client.Character;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.guild.MapleGuild;
import net.server.guild.Guild;
/**
*
@@ -38,7 +38,7 @@ public final class DenyGuildRequestHandler extends AbstractPacketHandler {
p.readByte();
Character cfrom = c.getWorldServer().getPlayerStorage().getCharacterByName(p.readString());
if (cfrom != null) {
MapleGuild.answerInvitation(c.getPlayer().getId(), c.getPlayer().getName(), cfrom.getGuildId(), false);
Guild.answerInvitation(c.getPlayer().getId(), c.getPlayer().getName(), cfrom.getGuildId(), false);
}
}
}

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

@@ -30,8 +30,8 @@ import net.packet.InPacket;
import net.server.Server;
import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType;
import net.server.guild.Alliance;
import net.server.guild.Guild;
import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildResponse;
import net.server.world.MapleParty;
import net.server.world.World;
@@ -77,7 +77,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
return;
}
Set<Character> eligibleMembers = new HashSet<>(MapleGuild.getEligiblePlayersForGuild(mc));
Set<Character> eligibleMembers = new HashSet<>(Guild.getEligiblePlayersForGuild(mc));
if (eligibleMembers.size() < YamlConfig.config.server.CREATE_GUILD_MIN_PARTNERS) {
if (mc.getMap().getAllPlayers().size() < YamlConfig.config.server.CREATE_GUILD_MIN_PARTNERS) {
// thanks NovaStory for noticing message in need of smoother info
@@ -108,7 +108,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
}
String targetName = p.readString();
MapleGuildResponse mgr = MapleGuild.sendInvitation(c, targetName);
MapleGuildResponse mgr = Guild.sendInvitation(c, targetName);
if (mgr != null) {
c.sendPacket(mgr.getPacket(targetName));
} else {} // already sent invitation, do nothing
@@ -126,7 +126,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
return;
}
if (!MapleGuild.answerInvitation(cid, mc.getName(), gid, true)) {
if (!Guild.answerInvitation(cid, mc.getName(), gid, true)) {
return;
}

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

@@ -37,8 +37,8 @@ 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.Guild;
import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.world.MaplePartyCharacter;
import net.server.world.PartyOperation;
import net.server.world.World;
@@ -268,7 +268,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
}
if (player.getGuildId() > 0) {
MapleGuild playerGuild = server.getGuild(player.getGuildId(), player.getWorld(), player);
Guild playerGuild = server.getGuild(player.getGuildId(), player.getWorld(), player);
if (playerGuild == null) {
player.deleteGuild(player.getGuildId());
player.getMGC().setGuildId(0);