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

Rename and clean up MapleItemInformationProvider

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:45:55 +02:00
parent 8f54b3e5de
commit 9c8abf6f62
81 changed files with 545 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/server/maps/HiredMerchant.java
View File

@@ -35,7 +35,7 @@ import net.packet.Packet;
import net.server.Server;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleTrade;
import tools.DatabaseConnection;
import tools.PacketCreator;
@@ -342,7 +342,7 @@ public class HiredMerchant extends AbstractMapObject {
Character player = Server.getInstance().getWorld(world).getPlayerStorage().getCharacterById(ownerId);
if (player != null && player.isLoggedinWorld()) {
player.dropMessage(6, "[Hired Merchant] Item '" + MapleItemInformationProvider.getInstance().getName(item.getItemId()) + "'" + qtyStr + " has been sold for " + mesos + " mesos. (" + inStore + " left)");
player.dropMessage(6, "[Hired Merchant] Item '" + ItemInformationProvider.getInstance().getName(item.getItemId()) + "'" + qtyStr + " has been sold for " + mesos + " mesos. (" + inStore + " left)");
}
}

12
src/main/java/server/maps/MapleMap.java
View File

@@ -53,7 +53,7 @@ import net.server.world.Party;
import net.server.world.World;
import scripting.event.EventInstanceManager;
import scripting.map.MapScriptManager;
import server.MapleItemInformationProvider;
import server.ItemInformationProvider;
import server.MapleStatEffect;
import server.TimerManager;
import server.events.gm.*;
@@ -610,7 +610,7 @@ public class MapleMap {
}
private static void sortDropEntries(List<MonsterDropEntry> from, List<MonsterDropEntry> item, List<MonsterDropEntry> visibleQuest, List<MonsterDropEntry> otherQuest, Character chr) {
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
for (MonsterDropEntry mde : from) {
if (!ii.isQuestItem(mde.itemId)) {
@@ -633,7 +633,7 @@ public class MapleMap {
Collections.shuffle(dropEntry);
Item idrop;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
for (final MonsterDropEntry de : dropEntry) {
float cardRate = chr.getCardRate(de.itemId);
@@ -678,7 +678,7 @@ public class MapleMap {
Collections.shuffle(globalEntry);
Item idrop;
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
for (final MonsterGlobalDropEntry de : globalEntry) {
if (Randomizer.nextInt(999999) < de.chance) {
@@ -1397,7 +1397,7 @@ public class MapleMap {
int buff = monster.getBuffToGive();
if (buff > -1) {
MapleItemInformationProvider mii = MapleItemInformationProvider.getInstance();
ItemInformationProvider mii = ItemInformationProvider.getInstance();
for (MapObject mmo : this.getPlayers()) {
Character character = (Character) mmo;
if (character.isAlive()) {
@@ -2177,7 +2177,7 @@ public class MapleMap {
Collections.shuffle(list);
MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
ItemInformationProvider ii = ItemInformationProvider.getInstance();
Random rnd = new Random();
final Point dropPos = new Point(pos);