Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Guild & Alliances Patches

Browse Source 
As reported by J0k3r613, patched guild system not recognizing properly
the guild leader just after creation. Patched many more issues related
to guilds and alliances.
This commit is contained in:
ronancpl
2017-06-21 01:17:25 -03:00
parent 7f6d420cf1
commit 6b2b3616d6
83 changed files with 293 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/scripting/event/EventInstanceManager.java
View File

@@ -235,7 +235,18 @@ public class EventInstanceManager {
ex.printStackTrace();
}
}
public void dropMessage(int type, String message) {
for (MapleCharacter chr : getPlayers()) {
chr.dropMessage(type, message);
}
}
public void restartEventTimer(long time) {
stopEventTimer();
startEventTimer(time);
}
public void startEventTimer(long time) {
timeStarted = System.currentTimeMillis();
eventTime = time;

2
src/scripting/event/EventManager.java
View File

@@ -279,7 +279,7 @@ public class EventManager {
startLobbyInstance(lobbyId);
}
EventInstanceManager eim = (EventInstanceManager) (iv.invokeFunction("setup", (Object) null));
EventInstanceManager eim = (EventInstanceManager) (iv.invokeFunction("setup", leader.getId()));
if(eim == null) {
if(lobbyId > -1) setLockLobby(lobbyId, false);
return false;

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

@@ -352,7 +352,9 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
public void upgradeAlliance() {
MapleAlliance alliance = Server.getInstance().getAlliance(c.getPlayer().getGuild().getAllianceId());
alliance.increaseCapacity(1);
c.announce(MaplePacketCreator.updateAllianceInfo(alliance, c));
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.getGuildAlliances(alliance, c.getWorld()), -1, -1);
Server.getInstance().allianceMessage(alliance.getId(), MaplePacketCreator.allianceNotice(alliance.getId(), alliance.getNotice()), -1, -1);
}
public void disbandAlliance(MapleClient c, int allianceId) {