Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-02-11 18:11:19 +01:00
Code Issues Projects Releases Wiki Activity

Always continue kill objective checks

Browse Source
This commit is contained in:
PikaMug 2021-09-23 23:22:12 -04:00
parent 3f26d3478b
commit a078973df2
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
View File

@ -677,9 +677,11 @@ public class PlayerListener implements Listener {
if (!quester.meetsCondition(quest, true)) { if (!quester.meetsCondition(quest, true)) {
continue; continue;
} }
if (!quester.getCurrentQuests().containsKey(quest)) {
continue;
}
if (quester.getCurrentQuests().containsKey(quest) if (quester.getCurrentStage(quest).containsObjective(type)) {
&& quester.getCurrentStage(quest).containsObjective(type)) {
quester.killMob(quest, target.getLocation(), target.getType()); quester.killMob(quest, target.getLocation(), target.getType());
} }
@ -779,9 +781,11 @@ public class PlayerListener implements Listener {
if (!quester.meetsCondition(quest, true)) { if (!quester.meetsCondition(quest, true)) {
continue; continue;
} }
if (!quester.getCurrentQuests().containsKey(quest)) {
continue;
}
if (quester.getCurrentQuests().containsKey(quest) if (quester.getCurrentStage(quest).containsObjective(type)) {
&& quester.getCurrentStage(quest).containsObjective(type)) {
quester.killPlayer(quest, (Player)target); quester.killPlayer(quest, (Player)target);
} }

21
main/src/main/java/me/blackvein/quests/storage/implementation/sql/SqlStorage.java
View File

@ -425,7 +425,7 @@ public class SqlStorage implements StorageImplementation {
} }
public ConcurrentHashMap<Quest, Integer> getQuesterCurrentQuests(final UUID uniqueId) throws Exception { public ConcurrentHashMap<Quest, Integer> getQuesterCurrentQuests(final UUID uniqueId) throws Exception {
final ConcurrentHashMap<Quest, Integer> currentQuests = new ConcurrentHashMap<Quest, Integer>(); final ConcurrentHashMap<Quest, Integer> currentQuests = new ConcurrentHashMap<>();
try (Connection c = connectionFactory.getConnection()) { try (Connection c = connectionFactory.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_CURRENT_QUESTS_SELECT_BY_UUID))) { try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_CURRENT_QUESTS_SELECT_BY_UUID))) {
ps.setString(1, uniqueId.toString()); ps.setString(1, uniqueId.toString());
@ -442,10 +442,9 @@ public class SqlStorage implements StorageImplementation {
return currentQuests; return currentQuests;
} }
@SuppressWarnings("unchecked")
public ConcurrentHashMap<Quest, QuestData> getQuesterQuestData(final UUID uniqueId) throws Exception { public ConcurrentHashMap<Quest, QuestData> getQuesterQuestData(final UUID uniqueId) throws Exception {
final Quester quester = plugin.getQuester(uniqueId); final Quester quester = plugin.getQuester(uniqueId);
final ConcurrentHashMap<Quest, QuestData> questData = new ConcurrentHashMap<Quest, QuestData>(); final ConcurrentHashMap<Quest, QuestData> questData = new ConcurrentHashMap<>();
try (Connection c = connectionFactory.getConnection()) { try (Connection c = connectionFactory.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_QUEST_DATA_SELECT_BY_UUID))) { try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_QUEST_DATA_SELECT_BY_UUID))) {
ps.setString(1, uniqueId.toString()); ps.setString(1, uniqueId.toString());
@ -499,7 +498,7 @@ public class SqlStorage implements StorageImplementation {
} }
public ConcurrentSkipListSet<Quest> getQuesterCompletedQuests(final UUID uniqueId) throws Exception { public ConcurrentSkipListSet<Quest> getQuesterCompletedQuests(final UUID uniqueId) throws Exception {
final ConcurrentSkipListSet<Quest> completedQuests = new ConcurrentSkipListSet<Quest>(); final ConcurrentSkipListSet<Quest> completedQuests = new ConcurrentSkipListSet<>();
try (Connection c = connectionFactory.getConnection()) { try (Connection c = connectionFactory.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_COMPLETED_QUESTS_SELECT_BY_UUID))) { try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_COMPLETED_QUESTS_SELECT_BY_UUID))) {
ps.setString(1, uniqueId.toString()); ps.setString(1, uniqueId.toString());
@ -517,7 +516,7 @@ public class SqlStorage implements StorageImplementation {
} }
public ConcurrentHashMap<Quest, Long> getQuesterCompletedTimes(final UUID uniqueId) throws Exception { public ConcurrentHashMap<Quest, Long> getQuesterCompletedTimes(final UUID uniqueId) throws Exception {
final ConcurrentHashMap<Quest, Long> completedTimes = new ConcurrentHashMap<Quest, Long>(); final ConcurrentHashMap<Quest, Long> completedTimes = new ConcurrentHashMap<>();
try (Connection c = connectionFactory.getConnection()) { try (Connection c = connectionFactory.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_REDOABLE_QUESTS_SELECT_BY_UUID))) { try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_REDOABLE_QUESTS_SELECT_BY_UUID))) {
ps.setString(1, uniqueId.toString()); ps.setString(1, uniqueId.toString());
@ -535,7 +534,7 @@ public class SqlStorage implements StorageImplementation {
} }
public ConcurrentHashMap<Quest, Integer> getQuesterAmountsCompleted(final UUID uniqueId) throws Exception { public ConcurrentHashMap<Quest, Integer> getQuesterAmountsCompleted(final UUID uniqueId) throws Exception {
final ConcurrentHashMap<Quest, Integer> amountsCompleted = new ConcurrentHashMap<Quest, Integer>(); final ConcurrentHashMap<Quest, Integer> amountsCompleted = new ConcurrentHashMap<>();
try (Connection c = connectionFactory.getConnection()) { try (Connection c = connectionFactory.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_REDOABLE_QUESTS_SELECT_BY_UUID))) { try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_REDOABLE_QUESTS_SELECT_BY_UUID))) {
ps.setString(1, uniqueId.toString()); ps.setString(1, uniqueId.toString());
@ -554,12 +553,12 @@ public class SqlStorage implements StorageImplementation {
@Override @Override
public Collection<UUID> getSavedUniqueIds() throws Exception { public Collection<UUID> getSavedUniqueIds() throws Exception {
final Collection<UUID> ids = new ConcurrentSkipListSet<UUID>(); final Collection<UUID> ids = new ConcurrentSkipListSet<>();
try (Connection c = connectionFactory.getConnection()) { try (Connection c = connectionFactory.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_SELECT_UUID))) { try (PreparedStatement ps = c.prepareStatement(statementProcessor.apply(PLAYER_SELECT_UUID))) {
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) { while (rs.next()) {
UUID id = null; UUID id;
try { try {
id = UUID.fromString(rs.getString("uuid")); id = UUID.fromString(rs.getString("uuid"));
} catch (final IllegalArgumentException e) { } catch (final IllegalArgumentException e) {
@ -584,7 +583,7 @@ public class SqlStorage implements StorageImplementation {
} }
public LinkedList<Integer> deserializeIntProgress(String string) { public LinkedList<Integer> deserializeIntProgress(String string) {
LinkedList<Integer> list = new LinkedList<Integer>(); LinkedList<Integer> list = new LinkedList<>();
if (string != null) { if (string != null) {
string = string.replace("{", "").replace("}", ""); string = string.replace("{", "").replace("}", "");
for (String section : string.split(",")) { for (String section : string.split(",")) {
@ -595,7 +594,7 @@ public class SqlStorage implements StorageImplementation {
} }
public LinkedList<Boolean> deserializeBooleanProgress(String string) { public LinkedList<Boolean> deserializeBooleanProgress(String string) {
LinkedList<Boolean> list = new LinkedList<Boolean>(); LinkedList<Boolean> list = new LinkedList<>();
if (string != null) { if (string != null) {
string = string.replace("{", "").replace("}", ""); string = string.replace("{", "").replace("}", "");
for (String section : string.split(",")) { for (String section : string.split(",")) {
@ -616,7 +615,7 @@ public class SqlStorage implements StorageImplementation {
} }
public LinkedList<ItemStack> deserializeItemStackProgress(String string, LinkedList<ItemStack> objective) { public LinkedList<ItemStack> deserializeItemStackProgress(String string, LinkedList<ItemStack> objective) {
LinkedList<ItemStack> list = new LinkedList<ItemStack>(); LinkedList<ItemStack> list = new LinkedList<>();
if (string != null) { if (string != null) {
string = string.replace("{", "").replace("}", ""); string = string.replace("{", "").replace("}", "");
int index = 0; int index = 0;