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

18
src/main/java/net/server/guild/MapleAlliance.java → src/main/java/net/server/guild/Alliance.java
View File

@@ -43,7 +43,7 @@ import java.util.List;
* @author XoticStory
* @author Ronan
*/
public class MapleAlliance {
public class Alliance {
final private List<Integer> guilds = new LinkedList<>();
private int allianceId = -1;
@@ -52,7 +52,7 @@ public class MapleAlliance {
private String notice = "";
private String[] rankTitles = new String[5];
public MapleAlliance(String name, int id) {
public Alliance(String name, int id) {
this.name = name;
allianceId = id;
String[] ranks = {"Master", "Jr. Master", "Member", "Member", "Member"};
@@ -109,7 +109,7 @@ public class MapleAlliance {
return mcl;
}
public static MapleAlliance createAlliance(MapleParty party, String name) {
public static Alliance createAlliance(MapleParty party, String name) {
List<Character> guildMasters = getPartyGuildMasters(party);
if (guildMasters.size() != 2) {
return null;
@@ -119,7 +119,7 @@ public class MapleAlliance {
for (Character mc : guildMasters) {
guilds.add(mc.getGuildId());
}
MapleAlliance alliance = MapleAlliance.createAllianceOnDb(guilds, name);
Alliance alliance = Alliance.createAllianceOnDb(guilds, name);
if (alliance != null) {
alliance.setCapacity(guilds.size());
for (Integer g : guilds) {
@@ -152,7 +152,7 @@ public class MapleAlliance {
return alliance;
}
public static MapleAlliance createAllianceOnDb(List<Integer> guilds, String name) {
public static Alliance createAllianceOnDb(List<Integer> guilds, String name) {
// will create an alliance, where the first guild listed is the leader and the alliance name MUST BE already checked for unicity.
int id = -1;
@@ -178,14 +178,14 @@ public class MapleAlliance {
return null;
}
return new MapleAlliance(name, id);
return new Alliance(name, id);
}
public static MapleAlliance loadAlliance(int id) {
public static Alliance loadAlliance(int id) {
if (id <= 0) {
return null;
}
MapleAlliance alliance = new MapleAlliance(null, -1);
Alliance alliance = new Alliance(null, -1);
try (Connection con = DatabaseConnection.getConnection()) {
try (PreparedStatement ps = con.prepareStatement("SELECT * FROM alliance WHERE id = ?")) {
@@ -292,7 +292,7 @@ public class MapleAlliance {
public static boolean removeGuildFromAlliance(int allianceId, int guildId, int worldId) {
Server srv = Server.getInstance();
MapleAlliance alliance = srv.getAlliance(allianceId);
Alliance alliance = srv.getAlliance(allianceId);
if (alliance.getLeader().getGuildId() == guildId) {
return false;

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

@@ -365,7 +365,7 @@ public class GuildPackets {
p.writeInt(guild.getAllianceId());
}
public static Packet getAllianceInfo(MapleAlliance alliance) {
public static Packet getAllianceInfo(Alliance alliance) {
OutPacket p = OutPacket.create(SendOpcode.ALLIANCE_OPERATION);
p.writeByte(0x0C);
p.writeByte(1);
@@ -383,7 +383,7 @@ public class GuildPackets {
return p;
}
public static Packet updateAllianceInfo(MapleAlliance alliance, int world) {
public static Packet updateAllianceInfo(Alliance alliance, int world) {
OutPacket p = OutPacket.create(SendOpcode.ALLIANCE_OPERATION);
p.writeByte(0x0F);
p.writeInt(alliance.getId());
@@ -403,7 +403,7 @@ public class GuildPackets {
return p;
}
public static Packet getGuildAlliances(MapleAlliance alliance, int worldId) {
public static Packet getGuildAlliances(Alliance alliance, int worldId) {
OutPacket p = OutPacket.create(SendOpcode.ALLIANCE_OPERATION);
p.writeByte(0x0D);
p.writeInt(alliance.getGuilds().size());
@@ -413,7 +413,7 @@ public class GuildPackets {
return p;
}
public static Packet addGuildToAlliance(MapleAlliance alliance, int newGuild, Client c) {
public static Packet addGuildToAlliance(Alliance alliance, int newGuild, Client c) {
OutPacket p = OutPacket.create(SendOpcode.ALLIANCE_OPERATION);
p.writeByte(0x12);
p.writeInt(alliance.getId());
@@ -471,7 +471,7 @@ public class GuildPackets {
return p;
}
public static Packet removeGuildFromAlliance(MapleAlliance alliance, int expelledGuild, int worldId) {
public static Packet removeGuildFromAlliance(Alliance alliance, int expelledGuild, int worldId) {
OutPacket p = OutPacket.create(SendOpcode.ALLIANCE_OPERATION);
p.writeByte(0x10);
p.writeInt(alliance.getId());

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

@@ -634,8 +634,8 @@ public class MapleGuild {
public void disbandGuild() {
if (allianceId > 0) {
if (!MapleAlliance.removeGuildFromAlliance(allianceId, id, world)) {
MapleAlliance.disbandAlliance(allianceId);
if (!Alliance.removeGuildFromAlliance(allianceId, id, world)) {
Alliance.disbandAlliance(allianceId);
}
}