Preparing for release

Solving conflicts.
Set constants to GMS-like. Ready for release.
This commit is contained in:
ronancpl
2017-11-29 10:34:46 -02:00
parent 85a81b9bf9
commit b9b0015e00
16 changed files with 910 additions and 77 deletions

View File

@@ -53,6 +53,8 @@ import server.TimerManager;
import server.maps.MapleHiredMerchant;
import server.maps.MapleMap;
import server.maps.MaplePlayerShop;
import server.maps.MaplePlayerShopItem;
import server.maps.AbstractMapleMapObject;
import net.server.worker.CharacterAutosaverWorker;
import net.server.worker.MountTirednessWorker;
import net.server.worker.PetFullnessWorker;
@@ -63,8 +65,6 @@ import net.server.channel.CharacterIdChannelPair;
import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter;
import net.server.guild.MapleGuildSummary;
import server.maps.MaplePlayerShopItem;
import server.maps.AbstractMapleMapObject;
import tools.DatabaseConnection;
import tools.MaplePacketCreator;
import tools.Pair;