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

Disallow Quest Journals in Item Frames, fixes #86

Browse Source
This commit is contained in:
HappyPikachu 2015-04-15 12:55:29 -04:00
parent 6f3271d0d0
commit f1b527064d
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,6 +359,16 @@ public class PlayerListener implements Listener, ColorUtil {
}
@EventHandler
public void onPlayerInteractEntity(PlayerInteractEntityEvent evt) {
if (evt.getRightClicked().getType() == EntityType.ITEM_FRAME) {
if(ItemUtil.isJournal(evt.getPlayer().getItemInHand())) {
evt.setCancelled(true);
evt.getPlayer().sendMessage(RED + Lang.get("journalDenied"));
}
}
}
@EventHandler
public void onPlayerChat(AsyncPlayerChatEvent evt) {
@ -502,7 +512,7 @@ public class PlayerListener implements Listener, ColorUtil {
for (Quest quest : quester.currentQuests.keySet()) {
if (evt.getEntity().getType().equals(EntityType.SHEEP) && quester.hasObjective(quest, "shearSheep")) {
if (evt.getEntity().getType() == EntityType.SHEEP && quester.hasObjective(quest, "shearSheep")) {
Sheep sheep = (Sheep) evt.getEntity();
quester.shearSheep(quest, sheep.getColor());

1
src/main/java/me/blackvein/quests/util/Lang.java
View File

@ -957,6 +957,7 @@ public class Lang {
langMap.put("journalAlreadyHave", "You already have your Quest Journal out.");
langMap.put("journalNoRoom", "You have no room in your inventory for your Quest Journal!");
langMap.put("journalNoQuests", "You have no accepted quests!");
langMap.put("journalDenied", "You cannot do that with your Quest Journal.");
//
//