Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-15 07:05:51 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused player kill timer superseded by #60

Browse Source
This commit is contained in:
HappyPikachu 2017-12-19 21:04:46 -05:00
parent c70b05e234
commit c1fb4762a4
2 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/me/blackvein/quests/QuestData.java
View File

@ -5,7 +5,6 @@ import java.util.EnumMap;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
import java.util.UUID;
import org.bukkit.DyeColor;
import org.bukkit.Location;
@ -310,40 +309,6 @@ public class QuestData {
quester.updateJournal();
}
};
public Map<UUID, Long> playerKillTimes = new HashMap<UUID, Long>() {
private static final long serialVersionUID = 9069594419068019465L;
@Override
public Long put(UUID key, Long val) {
Long data = super.put(key, val);
if (doJournalUpdate)
quester.updateJournal();
return data;
}
@Override
public Long remove(Object key) {
Long i = super.remove(key);
if (doJournalUpdate)
quester.updateJournal();
return i;
}
@Override
public void clear() {
super.clear();
if (doJournalUpdate)
quester.updateJournal();
}
@Override
public void putAll(Map<? extends UUID, ? extends Long> m) {
super.putAll(m);
if (doJournalUpdate)
quester.updateJournal();
}
};
public Map<Map<Enchantment, Material>, Integer> itemsEnchanted = new HashMap<Map<Enchantment, Material>, Integer>() {
private static final long serialVersionUID = 416869352279205852L;

29
src/main/java/me/blackvein/quests/Quester.java
View File

@ -842,10 +842,8 @@ public class Quester {
}
public void killMob(Quest quest, Location killedLocation, EntityType e) {
System.out.println("8");
QuestData questData = getQuestData(quest);
if (questData.mobsKilled.contains(e) == false) {
System.out.println("9");
return;
}
Stage currentStage = getCurrentStage(quest);
@ -853,7 +851,6 @@ public class Quester {
Integer numberOfSpecificMobKilled = questData.mobNumKilled.get(indexOfMobKilled);
Integer numberOfSpecificMobNeedsToBeKilledInCurrentStage = currentStage.mobNumToKill.get(indexOfMobKilled);
if (questData.locationsToKillWithin.isEmpty() == false) {
System.out.println("10-1");
Location locationToKillWithin = questData.locationsToKillWithin.get(indexOfMobKilled);
double radius = questData.radiiToKillWithin.get(indexOfMobKilled);
// Check world #name, not the object
@ -872,30 +869,15 @@ public class Quester {
}
}
if (numberOfSpecificMobKilled < numberOfSpecificMobNeedsToBeKilledInCurrentStage) {
System.out.println("10-2");
Integer newNumberOfSpecificMobKilled = numberOfSpecificMobKilled + 1;
questData.mobNumKilled.set(indexOfMobKilled, newNumberOfSpecificMobKilled);
if ((newNumberOfSpecificMobKilled).equals(numberOfSpecificMobNeedsToBeKilledInCurrentStage)) {
System.out.println("11");
finishObjective(quest, "killMob", null, null, null, e, null, null, null, null, null, null);
}
}
}
public void killPlayer(Quest quest, Player player) {
if (getQuestData(quest).playerKillTimes.containsKey(player.getUniqueId())) {
long killTime = getQuestData(quest).playerKillTimes.get(player.getUniqueId());
long comparator = plugin.killDelay * 1000;
long currentTime = System.currentTimeMillis();
if ((currentTime - killTime) < comparator) {
String error = Lang.get("killNotValid");
error = error.replaceAll("<time>", ChatColor.DARK_PURPLE + Quests.getTime(comparator - (currentTime - killTime)) + ChatColor.RED);
error = error.replaceAll("<player>", ChatColor.DARK_PURPLE + player.getName() + ChatColor.RED);
getPlayer().sendMessage(ChatColor.RED + error);
return;
}
}
getQuestData(quest).playerKillTimes.put(player.getUniqueId(), System.currentTimeMillis());
if (getQuestData(quest).getPlayersKilled() < getCurrentStage(quest).playersToKill) {
getQuestData(quest).setPlayersKilled(getQuestData(quest).getPlayersKilled() + 1);
if (((Integer) getQuestData(quest).getPlayersKilled()).equals(getCurrentStage(quest).playersToKill)) {
@ -1056,7 +1038,6 @@ public class Quester {
*/
public void finishObjective(Quest quest, String objective, ItemStack material, ItemStack delivery, Enchantment enchantment, EntityType mob, String player, NPC npc, Location location, DyeColor color, String pass, CustomObjective co) {
//TODO ItemStack material, is largely unnecessary as .name() can be obtained thru getQuestData(quest).blocksXXXX
System.out.println("13");
Player p = getPlayer();
if (getCurrentStage(quest).objectiveOverride != null) {
if (testComplete(quest)) {
@ -1148,12 +1129,10 @@ public class Quester {
quest.nextStage(this);
}
} else if (objective.equalsIgnoreCase("killMob")) {
System.out.println("14");
String message = ChatColor.GREEN + "(" + Lang.get("completed") + ") " + Lang.get("kill") + " " + mob.name();
message = message + " " + getCurrentStage(quest).mobNumToKill.get(getCurrentStage(quest).mobsToKill.indexOf(mob)) + "/" + getCurrentStage(quest).mobNumToKill.get(getCurrentStage(quest).mobsToKill.indexOf(mob));
p.sendMessage(message);
if (testComplete(quest)) {
System.out.println("15");
quest.nextStage(this);
}
} else if (objective.equalsIgnoreCase("killPlayer")) {
@ -2059,14 +2038,6 @@ public class Quester {
if (questSec.contains("fish-caught")) {
getQuestData(quest).setFishCaught(questSec.getInt("fish-caught"));
}
if (questSec.contains("players-killed")) {
getQuestData(quest).setPlayersKilled(questSec.getInt("players-killed"));
List<String> playerNames = questSec.getStringList("player-killed-names");
List<Long> killTimes = questSec.getLongList("kill-times");
for (String s : playerNames) {
getQuestData(quest).playerKillTimes.put(UUID.fromString(s), killTimes.get(playerNames.indexOf(s)));
}
}
if (questSec.contains("enchantments")) {
LinkedList<Enchantment> enchantments = new LinkedList<Enchantment>();
LinkedList<Material> materials = new LinkedList<Material>();