Sweetgum/sweetgum-server
1
1
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

4
scripts/npc/2010007.js
View File

@@ -58,8 +58,8 @@ function action(mode, type, selection) {
cm.sendOk("You can only increase your Guild's capacity if you are the leader."); cm.sendOk("You can only increase your Guild's capacity if you are the leader.");
cm.dispose(); cm.dispose();
} else { } else {
var MapleGuild = Java.type("net.server.guild.MapleGuild"); // thanks Conrad for noticing an issue due to call on a static method here var Guild = Java.type("net.server.guild.Guild"); // thanks Conrad for noticing an issue due to call on a static method here
cm.sendYesNo("Increasing your Guild capacity by #b5#k costs #b " + MapleGuild.getIncreaseGuildCost(cm.getPlayer().getGuild().getCapacity()) +" mesos#k, are you sure you want to continue?"); cm.sendYesNo("Increasing your Guild capacity by #b5#k costs #b " + Guild.getIncreaseGuildCost(cm.getPlayer().getGuild().getCapacity()) +" mesos#k, are you sure you want to continue?");
} }
} }
} else if (status == 2) { } else if (status == 2) {

10
src/main/java/client/Character.java
View File

@@ -46,8 +46,8 @@ import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator;
import net.server.guild.Alliance; import net.server.guild.Alliance;
import net.server.guild.Guild;
import net.server.guild.GuildPackets; import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter; import net.server.guild.MapleGuildCharacter;
import net.server.services.task.channel.FaceExpressionService; import net.server.services.task.channel.FaceExpressionService;
import net.server.services.task.world.CharacterSaveService; import net.server.services.task.world.CharacterSaveService;
@@ -1188,7 +1188,7 @@ public class Character extends AbstractCharacterObject {
family.broadcast(packet, id); family.broadcast(packet, id);
} }
MapleGuild guild = getGuild(); Guild guild = getGuild();
if (guild != null) { if (guild != null) {
guild.broadcast(packet, id); guild.broadcast(packet, id);
} }
@@ -4999,7 +4999,7 @@ public class Character extends AbstractCharacterObject {
return getGender() == 0; return getGender() == 0;
} }
public MapleGuild getGuild() { public Guild getGuild() {
try { try {
return Server.getInstance().getGuild(getGuildId(), getWorld(), this); return Server.getInstance().getGuild(getGuildId(), getWorld(), this);
} catch (Exception ex) { } catch (Exception ex) {
@@ -6036,7 +6036,7 @@ public class Character extends AbstractCharacterObject {
} }
public void increaseGuildCapacity() { public void increaseGuildCapacity() {
int cost = MapleGuild.getIncreaseGuildCost(getGuild().getCapacity()); int cost = Guild.getIncreaseGuildCost(getGuild().getCapacity());
if (getMeso() < cost) { if (getMeso() < cost) {
dropMessage(1, "You don't have enough mesos."); dropMessage(1, "You don't have enough mesos.");
@@ -10414,7 +10414,7 @@ public class Character extends AbstractCharacterObject {
} }
public void broadcastMarriageMessage() { public void broadcastMarriageMessage() {
MapleGuild guild = this.getGuild(); Guild guild = this.getGuild();
if (guild != null) { if (guild != null) {
guild.broadcast(PacketCreator.marriageMessage(0, name)); guild.broadcast(PacketCreator.marriageMessage(0, name));
} }

4
src/main/java/client/Client.java
View File

@@ -43,8 +43,8 @@ import net.server.coordinator.session.Hwid;
import net.server.coordinator.session.IpAddresses; import net.server.coordinator.session.IpAddresses;
import net.server.coordinator.session.SessionCoordinator; import net.server.coordinator.session.SessionCoordinator;
import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult; import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult;
import net.server.guild.Guild;
import net.server.guild.GuildPackets; import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter; import net.server.guild.MapleGuildCharacter;
import net.server.world.*; import net.server.world.*;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -967,7 +967,7 @@ public class Client extends ChannelInboundHandlerAdapter {
final BuddyList bl = player.getBuddylist(); final BuddyList bl = player.getBuddylist();
final MapleMessengerCharacter chrm = new MapleMessengerCharacter(player, 0); final MapleMessengerCharacter chrm = new MapleMessengerCharacter(player, 0);
final MapleGuildCharacter chrg = player.getMGC(); final MapleGuildCharacter chrg = player.getMGC();
final MapleGuild guild = player.getGuild(); final Guild guild = player.getGuild();
player.cancelMagicDoor(); player.cancelMagicDoor();

52
src/main/java/net/server/Server.java
View File

@@ -49,7 +49,7 @@ import net.server.channel.Channel;
import net.server.coordinator.session.IpAddresses; import net.server.coordinator.session.IpAddresses;
import net.server.coordinator.session.SessionCoordinator; import net.server.coordinator.session.SessionCoordinator;
import net.server.guild.Alliance; import net.server.guild.Alliance;
import net.server.guild.MapleGuild; import net.server.guild.Guild;
import net.server.guild.MapleGuildCharacter; import net.server.guild.MapleGuildCharacter;
import net.server.task.*; import net.server.task.*;
import net.server.world.World; import net.server.world.World;
@@ -104,7 +104,7 @@ public class Server {
private final Map<Integer, Integer> worldChars = new HashMap<>(); private final Map<Integer, Integer> worldChars = new HashMap<>();
private final Map<String, Integer> transitioningChars = new HashMap<>(); private final Map<String, Integer> transitioningChars = new HashMap<>();
private List<Pair<Integer, String>> worldRecommendedList = new LinkedList<>(); private List<Pair<Integer, String>> worldRecommendedList = new LinkedList<>();
private final Map<Integer, MapleGuild> guilds = new HashMap<>(100); private final Map<Integer, Guild> guilds = new HashMap<>(100);
private final Map<Client, Long> inLoginState = new HashMap<>(100); private final Map<Client, Long> inLoginState = new HashMap<>(100);
private final PlayerBuffStorage buffStorage = new PlayerBuffStorage(); private final PlayerBuffStorage buffStorage = new PlayerBuffStorage();
@@ -999,7 +999,7 @@ public class Server {
if (guildex == gid) { if (guildex == gid) {
continue; continue;
} }
MapleGuild guild = guilds.get(gid); Guild guild = guilds.get(gid);
if (guild != null) { if (guild != null) {
guild.broadcast(packet, exception); guild.broadcast(packet, exception);
} }
@@ -1055,12 +1055,12 @@ public class Server {
} }
public int createGuild(int leaderId, String name) { public int createGuild(int leaderId, String name) {
return MapleGuild.createGuild(leaderId, name); return Guild.createGuild(leaderId, name);
} }
public MapleGuild getGuildByName(String name) { public Guild getGuildByName(String name) {
synchronized (guilds) { synchronized (guilds) {
for (MapleGuild mg : guilds.values()) { for (Guild mg : guilds.values()) {
if (mg.getName().equalsIgnoreCase(name)) { if (mg.getName().equalsIgnoreCase(name)) {
return mg; return mg;
} }
@@ -1070,7 +1070,7 @@ public class Server {
} }
} }
public MapleGuild getGuild(int id) { public Guild getGuild(int id) {
synchronized (guilds) { synchronized (guilds) {
if (guilds.get(id) != null) { if (guilds.get(id) != null) {
return guilds.get(id); return guilds.get(id);
@@ -1080,18 +1080,18 @@ public class Server {
} }
} }
public MapleGuild getGuild(int id, int world) { public Guild getGuild(int id, int world) {
return getGuild(id, world, null); return getGuild(id, world, null);
} }
public MapleGuild getGuild(int id, int world, Character mc) { public Guild getGuild(int id, int world, Character mc) {
synchronized (guilds) { synchronized (guilds) {
MapleGuild g = guilds.get(id); Guild g = guilds.get(id);
if (g != null) { if (g != null) {
return g; return g;
} }
g = new MapleGuild(id, world); g = new Guild(id, world);
if (g.getId() == -1) { if (g.getId() == -1) {
return null; return null;
} }
@@ -1114,12 +1114,12 @@ public class Server {
} }
public void setGuildMemberOnline(Character mc, boolean bOnline, int channel) { public void setGuildMemberOnline(Character mc, boolean bOnline, int channel) {
MapleGuild g = getGuild(mc.getGuildId(), mc.getWorld(), mc); Guild g = getGuild(mc.getGuildId(), mc.getWorld(), mc);
g.setOnline(mc.getId(), bOnline, channel); g.setOnline(mc.getId(), bOnline, channel);
} }
public int addGuildMember(MapleGuildCharacter mgc, Character chr) { public int addGuildMember(MapleGuildCharacter mgc, Character chr) {
MapleGuild g = guilds.get(mgc.getGuildId()); Guild g = guilds.get(mgc.getGuildId());
if (g != null) { if (g != null) {
return g.addGuildMember(mgc, chr); return g.addGuildMember(mgc, chr);
} }
@@ -1127,7 +1127,7 @@ public class Server {
} }
public boolean setGuildAllianceId(int gId, int aId) { public boolean setGuildAllianceId(int gId, int aId) {
MapleGuild guild = guilds.get(gId); Guild guild = guilds.get(gId);
if (guild != null) { if (guild != null) {
guild.setAllianceId(aId); guild.setAllianceId(aId);
return true; return true;
@@ -1140,56 +1140,56 @@ public class Server {
} }
public void leaveGuild(MapleGuildCharacter mgc) { public void leaveGuild(MapleGuildCharacter mgc) {
MapleGuild g = guilds.get(mgc.getGuildId()); Guild g = guilds.get(mgc.getGuildId());
if (g != null) { if (g != null) {
g.leaveGuild(mgc); g.leaveGuild(mgc);
} }
} }
public void guildChat(int gid, String name, int cid, String msg) { public void guildChat(int gid, String name, int cid, String msg) {
MapleGuild g = guilds.get(gid); Guild g = guilds.get(gid);
if (g != null) { if (g != null) {
g.guildChat(name, cid, msg); g.guildChat(name, cid, msg);
} }
} }
public void changeRank(int gid, int cid, int newRank) { public void changeRank(int gid, int cid, int newRank) {
MapleGuild g = guilds.get(gid); Guild g = guilds.get(gid);
if (g != null) { if (g != null) {
g.changeRank(cid, newRank); g.changeRank(cid, newRank);
} }
} }
public void expelMember(MapleGuildCharacter initiator, String name, int cid) { public void expelMember(MapleGuildCharacter initiator, String name, int cid) {
MapleGuild g = guilds.get(initiator.getGuildId()); Guild g = guilds.get(initiator.getGuildId());
if (g != null) { if (g != null) {
g.expelMember(initiator, name, cid); g.expelMember(initiator, name, cid);
} }
} }
public void setGuildNotice(int gid, String notice) { public void setGuildNotice(int gid, String notice) {
MapleGuild g = guilds.get(gid); Guild g = guilds.get(gid);
if (g != null) { if (g != null) {
g.setGuildNotice(notice); g.setGuildNotice(notice);
} }
} }
public void memberLevelJobUpdate(MapleGuildCharacter mgc) { public void memberLevelJobUpdate(MapleGuildCharacter mgc) {
MapleGuild g = guilds.get(mgc.getGuildId()); Guild g = guilds.get(mgc.getGuildId());
if (g != null) { if (g != null) {
g.memberLevelJobUpdate(mgc); g.memberLevelJobUpdate(mgc);
} }
} }
public void changeRankTitle(int gid, String[] ranks) { public void changeRankTitle(int gid, String[] ranks) {
MapleGuild g = guilds.get(gid); Guild g = guilds.get(gid);
if (g != null) { if (g != null) {
g.changeRankTitle(ranks); g.changeRankTitle(ranks);
} }
} }
public void setGuildEmblem(int gid, short bg, byte bgcolor, short logo, byte logocolor) { public void setGuildEmblem(int gid, short bg, byte bgcolor, short logo, byte logocolor) {
MapleGuild g = guilds.get(gid); Guild g = guilds.get(gid);
if (g != null) { if (g != null) {
g.setGuildEmblem(bg, bgcolor, logo, logocolor); g.setGuildEmblem(bg, bgcolor, logo, logocolor);
} }
@@ -1197,14 +1197,14 @@ public class Server {
public void disbandGuild(int gid) { public void disbandGuild(int gid) {
synchronized (guilds) { synchronized (guilds) {
MapleGuild g = guilds.get(gid); Guild g = guilds.get(gid);
g.disbandGuild(); g.disbandGuild();
guilds.remove(gid); guilds.remove(gid);
} }
} }
public boolean increaseGuildCapacity(int gid) { public boolean increaseGuildCapacity(int gid) {
MapleGuild g = guilds.get(gid); Guild g = guilds.get(gid);
if (g != null) { if (g != null) {
return g.increaseCapacity(); return g.increaseCapacity();
} }
@@ -1212,7 +1212,7 @@ public class Server {
} }
public void gainGP(int gid, int amount) { public void gainGP(int gid, int amount) {
MapleGuild g = guilds.get(gid); Guild g = guilds.get(gid);
if (g != null) { if (g != null) {
g.gainGP(amount); g.gainGP(amount);
} }
@@ -1223,7 +1223,7 @@ public class Server {
} }
public void guildMessage(int gid, Packet packet, int exception) { public void guildMessage(int gid, Packet packet, int exception) {
MapleGuild g = guilds.get(gid); Guild g = guilds.get(gid);
if (g != null) { if (g != null) {
g.broadcast(packet, exception); g.broadcast(packet, exception);
} }

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.packet.InPacket;
import net.server.Server; import net.server.Server;
import net.server.guild.Alliance; import net.server.guild.Alliance;
import net.server.guild.Guild;
import net.server.guild.GuildPackets; import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter; import net.server.guild.MapleGuildCharacter;
import tools.PacketCreator; import tools.PacketCreator;
@@ -95,7 +95,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
break; break;
case 0x04: { // Accept Invite case 0x04: { // Accept Invite
MapleGuild guild = chr.getGuild(); Guild guild = chr.getGuild();
if (guild.getAllianceId() != 0 || chr.getGuildRank() != 1 || chr.getGuildId() < 1) { if (guild.getAllianceId() != 0 || chr.getGuildRank() != 1 || chr.getGuildId() < 1) {
return; return;
} }
@@ -123,7 +123,7 @@ public final class AllianceOperationHandler extends AbstractPacketHandler {
Server.getInstance().resetAllianceGuildPlayersRank(guildid); Server.getInstance().resetAllianceGuildPlayersRank(guildid);
chr.getMGC().setAllianceRank(2); chr.getMGC().setAllianceRank(2);
MapleGuild g = Server.getInstance().getGuild(chr.getGuildId()); Guild g = Server.getInstance().getGuild(chr.getGuildId());
if (g != null) { if (g != null) {
g.getMGC(chr.getId()).setAllianceRank(2); 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 client.Client;
import net.AbstractPacketHandler; import net.AbstractPacketHandler;
import net.packet.InPacket; 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(); p.readByte();
Character cfrom = c.getWorldServer().getPlayerStorage().getCharacterByName(p.readString()); Character cfrom = c.getWorldServer().getPlayerStorage().getCharacterByName(p.readString());
if (cfrom != null) { 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.Server;
import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType; import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType;
import net.server.guild.Alliance; import net.server.guild.Alliance;
import net.server.guild.Guild;
import net.server.guild.GuildPackets; import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildResponse; import net.server.guild.MapleGuildResponse;
import net.server.world.MapleParty; import net.server.world.MapleParty;
import net.server.world.World; import net.server.world.World;
@@ -77,7 +77,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
return; 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 (eligibleMembers.size() < YamlConfig.config.server.CREATE_GUILD_MIN_PARTNERS) {
if (mc.getMap().getAllPlayers().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 // thanks NovaStory for noticing message in need of smoother info
@@ -108,7 +108,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
} }
String targetName = p.readString(); String targetName = p.readString();
MapleGuildResponse mgr = MapleGuild.sendInvitation(c, targetName); MapleGuildResponse mgr = Guild.sendInvitation(c, targetName);
if (mgr != null) { if (mgr != null) {
c.sendPacket(mgr.getPacket(targetName)); c.sendPacket(mgr.getPacket(targetName));
} else {} // already sent invitation, do nothing } else {} // already sent invitation, do nothing
@@ -126,7 +126,7 @@ public final class GuildOperationHandler extends AbstractPacketHandler {
return; return;
} }
if (!MapleGuild.answerInvitation(cid, mc.getName(), gid, true)) { if (!Guild.answerInvitation(cid, mc.getName(), gid, true)) {
return; 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.session.SessionCoordinator;
import net.server.coordinator.world.EventRecallCoordinator; import net.server.coordinator.world.EventRecallCoordinator;
import net.server.guild.Alliance; import net.server.guild.Alliance;
import net.server.guild.Guild;
import net.server.guild.GuildPackets; import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.world.MaplePartyCharacter; import net.server.world.MaplePartyCharacter;
import net.server.world.PartyOperation; import net.server.world.PartyOperation;
import net.server.world.World; import net.server.world.World;
@@ -268,7 +268,7 @@ public final class PlayerLoggedinHandler extends AbstractPacketHandler {
} }
if (player.getGuildId() > 0) { 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) { if (playerGuild == null) {
player.deleteGuild(player.getGuildId()); player.deleteGuild(player.getGuildId());
player.getMGC().setGuildId(0); player.getMGC().setGuildId(0);

4
src/main/java/net/server/coordinator/matchchecker/listener/MatchCheckerGuildCreation.java
View File

@@ -26,8 +26,8 @@ import net.packet.Packet;
import net.server.Server; import net.server.Server;
import net.server.coordinator.matchchecker.AbstractMatchCheckerListener; import net.server.coordinator.matchchecker.AbstractMatchCheckerListener;
import net.server.coordinator.matchchecker.MatchCheckerListenerRecipe; import net.server.coordinator.matchchecker.MatchCheckerListenerRecipe;
import net.server.guild.Guild;
import net.server.guild.GuildPackets; import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter; import net.server.guild.MapleGuildCharacter;
import net.server.world.MapleParty; import net.server.world.MapleParty;
@@ -120,7 +120,7 @@ public class MatchCheckerGuildCreation implements MatchCheckerListenerRecipe {
leader.gainMeso(-YamlConfig.config.server.CREATE_GUILD_COST, true, false, true); leader.gainMeso(-YamlConfig.config.server.CREATE_GUILD_COST, true, false, true);
leader.getMGC().setGuildId(gid); leader.getMGC().setGuildId(gid);
MapleGuild guild = Server.getInstance().getGuild(leader.getGuildId(), leader.getWorld(), leader); // initialize guild structure Guild guild = Server.getInstance().getGuild(leader.getGuildId(), leader.getWorld(), leader); // initialize guild structure
Server.getInstance().changeRank(gid, leader.getId(), 1); Server.getInstance().changeRank(gid, leader.getId(), 1);
leader.sendPacket(GuildPackets.showGuildInfo(leader)); leader.sendPacket(GuildPackets.showGuildInfo(leader));

6
src/main/java/net/server/guild/Alliance.java
View File

@@ -406,7 +406,7 @@ public class Alliance {
public MapleGuildCharacter getLeader() { public MapleGuildCharacter getLeader() {
synchronized (guilds) { synchronized (guilds) {
for (Integer gId : guilds) { for (Integer gId : guilds) {
MapleGuild guild = Server.getInstance().getGuild(gId); Guild guild = Server.getInstance().getGuild(gId);
MapleGuildCharacter mgc = guild.getMGC(guild.getLeaderId()); MapleGuildCharacter mgc = guild.getMGC(guild.getLeaderId());
if (mgc.getAllianceRank() == 1) { if (mgc.getAllianceRank() == 1) {
@@ -425,7 +425,7 @@ public class Alliance {
public void dropMessage(int type, String message) { public void dropMessage(int type, String message) {
synchronized (guilds) { synchronized (guilds) {
for (Integer gId : guilds) { for (Integer gId : guilds) {
MapleGuild guild = Server.getInstance().getGuild(gId); Guild guild = Server.getInstance().getGuild(gId);
guild.dropMessage(type, message); guild.dropMessage(type, message);
} }
} }
@@ -436,7 +436,7 @@ public class Alliance {
} }
public static void sendInvitation(Client c, String targetGuildName, int allianceId) { public static void sendInvitation(Client c, String targetGuildName, int allianceId) {
MapleGuild mg = Server.getInstance().getGuildByName(targetGuildName); Guild mg = Server.getInstance().getGuildByName(targetGuildName);
if (mg == null) { if (mg == null) {
c.getPlayer().dropMessage(5, "The entered guild does not exist."); c.getPlayer().dropMessage(5, "The entered guild does not exist.");
} else { } else {

6
src/main/java/net/server/guild/MapleGuild.java → src/main/java/net/server/guild/Guild.java
View File

@@ -44,7 +44,7 @@ import java.sql.SQLException;
import java.util.*; import java.util.*;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
public class MapleGuild { public class Guild {
private enum BCOp { private enum BCOp {
NONE, DISBAND, EMBLEMCHANGE NONE, DISBAND, EMBLEMCHANGE
@@ -60,7 +60,7 @@ public class MapleGuild {
private Map<Integer, List<Integer>> notifications = new LinkedHashMap<>(); private Map<Integer, List<Integer>> notifications = new LinkedHashMap<>();
private boolean bDirty = true; private boolean bDirty = true;
public MapleGuild(int guildid, int world) { public Guild(int guildid, int world) {
this.world = world; this.world = world;
members = new ArrayList<>(); members = new ArrayList<>();
@@ -521,7 +521,7 @@ public class MapleGuild {
ps.executeUpdate(); ps.executeUpdate();
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
System.out.println("expelMember - MapleGuild " + e); System.out.println("expelMember - Guild " + e);
} }
Server.getInstance().getWorld(mgc.getWorld()).setOfflineGuildStatus((short) 0, (byte) 5, cid); Server.getInstance().getWorld(mgc.getWorld()).setOfflineGuildStatus((short) 0, (byte) 5, cid);
} }

6
src/main/java/net/server/guild/GuildPackets.java
View File

@@ -23,7 +23,7 @@ public class GuildPackets {
p.writeByte(0); p.writeByte(0);
return p; return p;
} }
MapleGuild g = chr.getClient().getWorldServer().getGuild(chr.getMGC()); Guild g = chr.getClient().getWorldServer().getGuild(chr.getMGC());
if (g == null) { //failed to read from DB - don't show a guild if (g == null) { //failed to read from DB - don't show a guild
p.writeByte(0); p.writeByte(0);
return p; return p;
@@ -335,7 +335,7 @@ public class GuildPackets {
return p; return p;
} }
public static void getGuildInfo(OutPacket p, MapleGuild guild) { public static void getGuildInfo(OutPacket p, Guild guild) {
p.writeInt(guild.getId()); p.writeInt(guild.getId());
p.writeString(guild.getName()); p.writeString(guild.getName());
for (int i = 1; i <= 5; i++) { for (int i = 1; i <= 5; i++) {
@@ -531,7 +531,7 @@ public class GuildPackets {
return p; return p;
} }
public static Packet guildMarkChanged(int chrId, MapleGuild guild) { public static Packet guildMarkChanged(int chrId, Guild guild) {
OutPacket p = OutPacket.create(SendOpcode.GUILD_MARK_CHANGED); OutPacket p = OutPacket.create(SendOpcode.GUILD_MARK_CHANGED);
p.writeInt(chrId); p.writeInt(chrId);
p.writeShort(guild.getLogoBG()); p.writeShort(guild.getLogoBG());

2
src/main/java/net/server/guild/MapleGuildSummary.java
View File

@@ -29,7 +29,7 @@ public class MapleGuildSummary {
private byte logoColor; private byte logoColor;
private int allianceId; private int allianceId;
public MapleGuildSummary(MapleGuild g) { public MapleGuildSummary(Guild g) {
this.name = g.getName(); this.name = g.getName();
this.logoBG = (short) g.getLogoBG(); this.logoBG = (short) g.getLogoBG();
this.logoBGColor = (byte) g.getLogoBGColor(); this.logoBGColor = (byte) g.getLogoBGColor();

12
src/main/java/net/server/world/World.java
View File

@@ -44,8 +44,8 @@ import net.server.coordinator.partysearch.PartySearchCoordinator;
import net.server.coordinator.world.InviteCoordinator; import net.server.coordinator.world.InviteCoordinator;
import net.server.coordinator.world.InviteCoordinator.InviteResult; import net.server.coordinator.world.InviteCoordinator.InviteResult;
import net.server.coordinator.world.InviteCoordinator.InviteType; import net.server.coordinator.world.InviteCoordinator.InviteType;
import net.server.guild.Guild;
import net.server.guild.GuildPackets; import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter; import net.server.guild.MapleGuildCharacter;
import net.server.guild.MapleGuildSummary; import net.server.guild.MapleGuildSummary;
import net.server.services.BaseService; import net.server.services.BaseService;
@@ -576,11 +576,11 @@ public class World {
} }
} }
public MapleGuild getGuild(MapleGuildCharacter mgc) { public Guild getGuild(MapleGuildCharacter mgc) {
if(mgc == null) return null; if(mgc == null) return null;
int gid = mgc.getGuildId(); int gid = mgc.getGuildId();
MapleGuild g = Server.getInstance().getGuild(gid, mgc.getWorld(), mgc.getCharacter()); Guild g = Server.getInstance().getGuild(gid, mgc.getWorld(), mgc.getCharacter());
if (gsStore.get(gid) == null) { if (gsStore.get(gid) == null) {
gsStore.put(gid, new MapleGuildSummary(g)); gsStore.put(gid, new MapleGuildSummary(g));
} }
@@ -611,7 +611,7 @@ public class World {
if (gsStore.containsKey(gid)) { if (gsStore.containsKey(gid)) {
return gsStore.get(gid); return gsStore.get(gid);
} else { } else {
MapleGuild g = Server.getInstance().getGuild(gid, wid, null); Guild g = Server.getInstance().getGuild(gid, wid, null);
if (g != null) { if (g != null) {
gsStore.put(gid, new MapleGuildSummary(g)); gsStore.put(gid, new MapleGuildSummary(g));
} }
@@ -624,7 +624,7 @@ public class World {
} }
public void reloadGuildSummary() { public void reloadGuildSummary() {
MapleGuild g; Guild g;
Server server = Server.getInstance(); Server server = Server.getInstance();
for (int i : gsStore.keySet()) { for (int i : gsStore.keySet()) {
g = server.getGuild(i, getId(), null); g = server.getGuild(i, getId(), null);
@@ -675,7 +675,7 @@ public class World {
} }
if (bDifferentGuild) { if (bDifferentGuild) {
if (mc.isLoggedinWorld()) { if (mc.isLoggedinWorld()) {
MapleGuild guild = Server.getInstance().getGuild(guildid); Guild guild = Server.getInstance().getGuild(guildid);
if (guild != null) { if (guild != null) {
mc.getMap().broadcastPacket(mc, GuildPackets.guildNameChanged(cid, guild.getName())); mc.getMap().broadcastPacket(mc, GuildPackets.guildNameChanged(cid, guild.getName()));
mc.getMap().broadcastPacket(mc, GuildPackets.guildMarkChanged(cid, guild)); mc.getMap().broadcastPacket(mc, GuildPackets.guildMarkChanged(cid, guild));

4
src/main/java/scripting/AbstractPlayerInteraction.java
View File

@@ -30,7 +30,7 @@ import config.YamlConfig;
import constants.game.GameConstants; import constants.game.GameConstants;
import constants.inventory.ItemConstants; import constants.inventory.ItemConstants;
import net.server.Server; import net.server.Server;
import net.server.guild.MapleGuild; import net.server.guild.Guild;
import net.server.world.MapleParty; import net.server.world.MapleParty;
import net.server.world.MaplePartyCharacter; import net.server.world.MaplePartyCharacter;
import scripting.event.EventInstanceManager; import scripting.event.EventInstanceManager;
@@ -714,7 +714,7 @@ public class AbstractPlayerInteraction {
} }
} }
public MapleGuild getGuild() { public Guild getGuild() {
try { try {
return Server.getInstance().getGuild(getPlayer().getGuildId(), getPlayer().getWorld(), null); return Server.getInstance().getGuild(getPlayer().getGuildId(), getPlayer().getWorld(), null);
} catch (Exception e) { } catch (Exception e) {

6
src/main/java/scripting/event/EventManager.java
View File

@@ -30,7 +30,7 @@ import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantLock; import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory; import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import net.server.channel.Channel; import net.server.channel.Channel;
import net.server.guild.MapleGuild; import net.server.guild.Guild;
import net.server.world.MapleParty; import net.server.world.MapleParty;
import net.server.world.MaplePartyCharacter; import net.server.world.MaplePartyCharacter;
import net.server.world.World; import net.server.world.World;
@@ -742,7 +742,7 @@ public class EventManager {
} }
private void exportReadyGuild(Integer guildId) { private void exportReadyGuild(Integer guildId) {
MapleGuild mg = server.getGuild(guildId); Guild mg = server.getGuild(guildId);
String callout = "[Guild Quest] Your guild has been registered to attend to the Sharenian Guild Quest at channel " + this.getChannelServer().getId() String callout = "[Guild Quest] Your guild has been registered to attend to the Sharenian Guild Quest at channel " + this.getChannelServer().getId()
+ " and HAS JUST STARTED THE STRATEGY PHASE. After 3 minutes, no more guild members will be allowed to join the effort." + " and HAS JUST STARTED THE STRATEGY PHASE. After 3 minutes, no more guild members will be allowed to join the effort."
+ " Check out Shuang at the excavation site in Perion for more info."; + " Check out Shuang at the excavation site in Perion for more info.";
@@ -751,7 +751,7 @@ public class EventManager {
} }
private void exportMovedQueueToGuild(Integer guildId, int place) { private void exportMovedQueueToGuild(Integer guildId, int place) {
MapleGuild mg = server.getGuild(guildId); Guild mg = server.getGuild(guildId);
String callout = "[Guild Quest] Your guild has been registered to attend to the Sharenian Guild Quest at channel " + this.getChannelServer().getId() String callout = "[Guild Quest] Your guild has been registered to attend to the Sharenian Guild Quest at channel " + this.getChannelServer().getId()
+ " and is currently on the " + GameConstants.ordinal(place) + " place on the waiting queue."; + " and is currently on the " + GameConstants.ordinal(place) + " place on the waiting queue.";

4
src/main/java/scripting/npc/NPCConversationManager.java
View File

@@ -34,8 +34,8 @@ import net.server.Server;
import net.server.channel.Channel; import net.server.channel.Channel;
import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType; import net.server.coordinator.matchchecker.MatchCheckerListenerFactory.MatchCheckerType;
import net.server.guild.Alliance; import net.server.guild.Alliance;
import net.server.guild.Guild;
import net.server.guild.GuildPackets; import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.world.MapleParty; import net.server.world.MapleParty;
import net.server.world.MaplePartyCharacter; import net.server.world.MaplePartyCharacter;
import provider.MapleData; import provider.MapleData;
@@ -306,7 +306,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
} }
public void displayGuildRanks() { public void displayGuildRanks() {
MapleGuild.displayGuildRanks(getClient(), npc); Guild.displayGuildRanks(getClient(), npc);
} }
public boolean canSpawnPlayerNpc(int mapid) { public boolean canSpawnPlayerNpc(int mapid) {

4
src/main/java/tools/PacketCreator.java
View File

@@ -50,7 +50,7 @@ import net.server.channel.handlers.PlayerInteractionHandler;
import net.server.channel.handlers.SummonDamageHandler.SummonAttackEntry; import net.server.channel.handlers.SummonDamageHandler.SummonAttackEntry;
import net.server.channel.handlers.WhisperHandler; import net.server.channel.handlers.WhisperHandler;
import net.server.guild.Alliance; import net.server.guild.Alliance;
import net.server.guild.MapleGuild; import net.server.guild.Guild;
import net.server.guild.MapleGuildSummary; import net.server.guild.MapleGuildSummary;
import net.server.world.MapleParty; import net.server.world.MapleParty;
import net.server.world.MaplePartyCharacter; import net.server.world.MaplePartyCharacter;
@@ -2682,7 +2682,7 @@ public class PacketCreator {
String guildName = ""; String guildName = "";
String allianceName = ""; String allianceName = "";
if (chr.getGuildId() > 0) { if (chr.getGuildId() > 0) {
MapleGuild mg = Server.getInstance().getGuild(chr.getGuildId()); Guild mg = Server.getInstance().getGuild(chr.getGuildId());
guildName = mg.getName(); guildName = mg.getName();
Alliance alliance = Server.getInstance().getAlliance(chr.getGuild().getAllianceId()); Alliance alliance = Server.getInstance().getAlliance(chr.getGuild().getAllianceId());