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

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

@@ -30,7 +30,7 @@ import config.YamlConfig;
import constants.game.GameConstants;
import constants.inventory.ItemConstants;
import net.server.Server;
import net.server.guild.MapleGuild;
import net.server.guild.Guild;
import net.server.world.MapleParty;
import net.server.world.MaplePartyCharacter;
import scripting.event.EventInstanceManager;
@@ -714,7 +714,7 @@ public class AbstractPlayerInteraction {
}
}
public MapleGuild getGuild() {
public Guild getGuild() {
try {
return Server.getInstance().getGuild(getPlayer().getGuildId(), getPlayer().getWorld(), null);
} 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.factory.MonitoredReentrantLockFactory;
import net.server.channel.Channel;
import net.server.guild.MapleGuild;
import net.server.guild.Guild;
import net.server.world.MapleParty;
import net.server.world.MaplePartyCharacter;
import net.server.world.World;
@@ -742,7 +742,7 @@ public class EventManager {
}
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()
+ " 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.";
@@ -751,7 +751,7 @@ public class EventManager {
}
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()
+ " 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.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.world.MapleParty;
import net.server.world.MaplePartyCharacter;
import provider.MapleData;
@@ -306,7 +306,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
}
public void displayGuildRanks() {
MapleGuild.displayGuildRanks(getClient(), npc);
Guild.displayGuildRanks(getClient(), npc);
}
public boolean canSpawnPlayerNpc(int mapid) {