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

Rename and clean up MapleEvents

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:58:35 +02:00
parent 6a4b1b2a8a
commit fbffb7ef71
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/client/Character.java
View File

@@ -59,7 +59,7 @@ import scripting.event.EventInstanceManager;
import scripting.item.ItemScriptManager; import scripting.item.ItemScriptManager;
import server.*; import server.*;
import server.MapleItemInformationProvider.ScriptedItem; import server.MapleItemInformationProvider.ScriptedItem;
import server.events.MapleEvents; import server.events.Events;
import server.events.RescueGaga; import server.events.RescueGaga;
import server.events.gm.Fitness; import server.events.gm.Fitness;
import server.events.gm.Ola; import server.events.gm.Ola;
@@ -230,7 +230,7 @@ public class Character extends AbstractCharacterObject {
private byte pendantExp = 0, lastmobcount = 0, doorSlot = -1; private byte pendantExp = 0, lastmobcount = 0, doorSlot = -1;
private final List<Integer> trockmaps = new ArrayList<>(); private final List<Integer> trockmaps = new ArrayList<>();
private final List<Integer> viptrockmaps = new ArrayList<>(); private final List<Integer> viptrockmaps = new ArrayList<>();
private Map<String, MapleEvents> events = new LinkedHashMap<>(); private Map<String, Events> events = new LinkedHashMap<>();
private PartyQuest partyQuest = null; private PartyQuest partyQuest = null;
private final List<Pair<DelayedQuestUpdate, Object[]>> npcUpdateQuests = new LinkedList<>(); private final List<Pair<DelayedQuestUpdate, Object[]>> npcUpdateQuests = new LinkedList<>();
private MapleDragon dragon = null; private MapleDragon dragon = null;
@@ -8658,7 +8658,7 @@ public class Character extends AbstractCharacterObject {
try (PreparedStatement psEvent = con.prepareStatement("INSERT INTO eventstats (characterid, name, info) VALUES (?, ?, ?)")) { try (PreparedStatement psEvent = con.prepareStatement("INSERT INTO eventstats (characterid, name, info) VALUES (?, ?, ?)")) {
psEvent.setInt(1, id); psEvent.setInt(1, id);
for (Map.Entry<String, MapleEvents> entry : events.entrySet()) { for (Map.Entry<String, Events> entry : events.entrySet()) {
psEvent.setString(2, entry.getKey()); psEvent.setString(2, entry.getKey());
psEvent.setInt(3, entry.getValue().getInfo()); psEvent.setInt(3, entry.getValue().getInfo());
psEvent.addBatch(); psEvent.addBatch();
@@ -10425,7 +10425,7 @@ public class Character extends AbstractCharacterObject {
} }
} }
public Map<String, MapleEvents> getEvents() { public Map<String, Events> getEvents() {
return events; return events;
} }

4
src/main/java/server/events/MapleEvents.java → src/main/java/server/events/Events.java
View File

@@ -25,8 +25,8 @@ package server.events;
/** /**
* @author kevintjuh93 * @author kevintjuh93
*/ */
public abstract class MapleEvents { public abstract class Events {
public MapleEvents() { public Events() {
} }

2
src/main/java/server/events/RescueGaga.java
View File

@@ -12,7 +12,7 @@ import client.SkillFactory;
* *
* @author kevintjuh93 * @author kevintjuh93
*/ */
public class RescueGaga extends MapleEvents { public class RescueGaga extends Events {
private int completed; private int completed;