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

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.coordinator.world.InviteCoordinator;
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 net.server.services.task.channel.FaceExpressionService;
import net.server.services.task.world.CharacterSaveService;
@@ -1188,7 +1188,7 @@ public class Character extends AbstractCharacterObject {
family.broadcast(packet, id);
}
MapleGuild guild = getGuild();
Guild guild = getGuild();
if (guild != null) {
guild.broadcast(packet, id);
}
@@ -4999,7 +4999,7 @@ public class Character extends AbstractCharacterObject {
return getGender() == 0;
}
public MapleGuild getGuild() {
public Guild getGuild() {
try {
return Server.getInstance().getGuild(getGuildId(), getWorld(), this);
} catch (Exception ex) {
@@ -6036,7 +6036,7 @@ public class Character extends AbstractCharacterObject {
}
public void increaseGuildCapacity() {
int cost = MapleGuild.getIncreaseGuildCost(getGuild().getCapacity());
int cost = Guild.getIncreaseGuildCost(getGuild().getCapacity());
if (getMeso() < cost) {
dropMessage(1, "You don't have enough mesos.");
@@ -10414,7 +10414,7 @@ public class Character extends AbstractCharacterObject {
}
public void broadcastMarriageMessage() {
MapleGuild guild = this.getGuild();
Guild guild = this.getGuild();
if (guild != null) {
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.SessionCoordinator;
import net.server.coordinator.session.SessionCoordinator.AntiMulticlientResult;
import net.server.guild.Guild;
import net.server.guild.GuildPackets;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter;
import net.server.world.*;
import org.slf4j.Logger;
@@ -967,7 +967,7 @@ public class Client extends ChannelInboundHandlerAdapter {
final BuddyList bl = player.getBuddylist();
final MapleMessengerCharacter chrm = new MapleMessengerCharacter(player, 0);
final MapleGuildCharacter chrg = player.getMGC();
final MapleGuild guild = player.getGuild();
final Guild guild = player.getGuild();
player.cancelMagicDoor();