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/guild/Alliance.java
View File

@@ -406,7 +406,7 @@ public class Alliance {
public MapleGuildCharacter getLeader() {
synchronized (guilds) {
for (Integer gId : guilds) {
MapleGuild guild = Server.getInstance().getGuild(gId);
Guild guild = Server.getInstance().getGuild(gId);
MapleGuildCharacter mgc = guild.getMGC(guild.getLeaderId());
if (mgc.getAllianceRank() == 1) {
@@ -425,7 +425,7 @@ public class Alliance {
public void dropMessage(int type, String message) {
synchronized (guilds) {
for (Integer gId : guilds) {
MapleGuild guild = Server.getInstance().getGuild(gId);
Guild guild = Server.getInstance().getGuild(gId);
guild.dropMessage(type, message);
}
}
@@ -436,7 +436,7 @@ public class Alliance {
}
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) {
c.getPlayer().dropMessage(5, "The entered guild does not exist.");
} 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.concurrent.locks.Lock;
public class MapleGuild {
public class Guild {
private enum BCOp {
NONE, DISBAND, EMBLEMCHANGE
@@ -60,7 +60,7 @@ public class MapleGuild {
private Map<Integer, List<Integer>> notifications = new LinkedHashMap<>();
private boolean bDirty = true;
public MapleGuild(int guildid, int world) {
public Guild(int guildid, int world) {
this.world = world;
members = new ArrayList<>();
@@ -521,7 +521,7 @@ public class MapleGuild {
ps.executeUpdate();
} catch (SQLException e) {
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);
}

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

@@ -23,7 +23,7 @@ public class GuildPackets {
p.writeByte(0);
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
p.writeByte(0);
return p;
@@ -335,7 +335,7 @@ public class GuildPackets {
return p;
}
public static void getGuildInfo(OutPacket p, MapleGuild guild) {
public static void getGuildInfo(OutPacket p, Guild guild) {
p.writeInt(guild.getId());
p.writeString(guild.getName());
for (int i = 1; i <= 5; i++) {
@@ -531,7 +531,7 @@ public class GuildPackets {
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);
p.writeInt(chrId);
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 int allianceId;
public MapleGuildSummary(MapleGuild g) {
public MapleGuildSummary(Guild g) {
this.name = g.getName();
this.logoBG = (short) g.getLogoBG();
this.logoBGColor = (byte) g.getLogoBGColor();