mirror of https://github.com/PikaMug/Quests.git
Clean up spacing
This commit is contained in:
parent
5604392814
commit
0329e71f3c
|
@ -88,11 +88,11 @@ public class BlockListener implements Listener {
|
||||||
|
|
||||||
dispatchedBreakQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, breakType,
|
dispatchedBreakQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, breakType,
|
||||||
(final IQuester q, final IQuest cq) -> {
|
(final IQuester q, final IQuest cq) -> {
|
||||||
if (!dispatchedBreakQuestIDs.contains(cq.getId())) {
|
if (!dispatchedBreakQuestIDs.contains(cq.getId())) {
|
||||||
q.breakBlock(cq, blockItemStack);
|
q.breakBlock(cq, blockItemStack);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (quest.getOptions().canIgnoreBlockReplace()) {
|
if (quest.getOptions().canIgnoreBlockReplace()) {
|
||||||
|
@ -127,35 +127,35 @@ public class BlockListener implements Listener {
|
||||||
// Ignore blocks broken once replaced (party support)
|
// Ignore blocks broken once replaced (party support)
|
||||||
dispatchedPlaceQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, placeType,
|
dispatchedPlaceQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, placeType,
|
||||||
(final IQuester q, final IQuest cq) -> {
|
(final IQuester q, final IQuest cq) -> {
|
||||||
if (!dispatchedPlaceQuestIDs.contains(cq.getId())) {
|
if (!dispatchedPlaceQuestIDs.contains(cq.getId())) {
|
||||||
for (final ItemStack is : q.getQuestData(cq).blocksPlaced) {
|
for (final ItemStack is : q.getQuestData(cq).blocksPlaced) {
|
||||||
if (event.getBlock().getType().equals(is.getType()) && is.getAmount() > 0) {
|
if (event.getBlock().getType().equals(is.getType()) && is.getAmount() > 0) {
|
||||||
ItemStack toPlace = new ItemStack(is.getType(), 64);
|
ItemStack toPlace = new ItemStack(is.getType(), 64);
|
||||||
for (final ItemStack stack : quester.getCurrentStage(cq).getBlocksToPlace()) {
|
for (final ItemStack stack : quester.getCurrentStage(cq).getBlocksToPlace()) {
|
||||||
if (ItemUtil.compareItems(is, stack, true) == 0) {
|
if (ItemUtil.compareItems(is, stack, true) == 0) {
|
||||||
toPlace = stack;
|
toPlace = stack;
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final QuesterPreUpdateObjectiveEvent preEvent
|
|
||||||
= new QuesterPreUpdateObjectiveEvent((Quester) q, cq,
|
|
||||||
new BukkitObjective(placeType, is.getAmount(), toPlace.getAmount()));
|
|
||||||
plugin.getServer().getPluginManager().callEvent(preEvent);
|
|
||||||
|
|
||||||
final int index = q.getQuestData(cq).blocksPlaced.indexOf(is);
|
|
||||||
final int newAmount = is.getAmount() - 1;
|
|
||||||
is.setAmount(newAmount);
|
|
||||||
q.getQuestData(cq).blocksPlaced.set(index, is);
|
|
||||||
|
|
||||||
final QuesterPostUpdateObjectiveEvent postEvent
|
|
||||||
= new QuesterPostUpdateObjectiveEvent((Quester) q, cq,
|
|
||||||
new BukkitObjective(placeType, newAmount, toPlace.getAmount()));
|
|
||||||
plugin.getServer().getPluginManager().callEvent(postEvent);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final QuesterPreUpdateObjectiveEvent preEvent
|
||||||
|
= new QuesterPreUpdateObjectiveEvent((Quester) q, cq,
|
||||||
|
new BukkitObjective(placeType, is.getAmount(), toPlace.getAmount()));
|
||||||
|
plugin.getServer().getPluginManager().callEvent(preEvent);
|
||||||
|
|
||||||
|
final int index = q.getQuestData(cq).blocksPlaced.indexOf(is);
|
||||||
|
final int newAmount = is.getAmount() - 1;
|
||||||
|
is.setAmount(newAmount);
|
||||||
|
q.getQuestData(cq).blocksPlaced.set(index, is);
|
||||||
|
|
||||||
|
final QuesterPostUpdateObjectiveEvent postEvent
|
||||||
|
= new QuesterPostUpdateObjectiveEvent((Quester) q, cq,
|
||||||
|
new BukkitObjective(placeType, newAmount, toPlace.getAmount()));
|
||||||
|
plugin.getServer().getPluginManager().callEvent(postEvent);
|
||||||
}
|
}
|
||||||
return null;
|
}
|
||||||
}));
|
}
|
||||||
|
return null;
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
if (currentStage.containsObjective(cutType)) {
|
if (currentStage.containsObjective(cutType)) {
|
||||||
if (player.getItemInHand().getType().equals(Material.SHEARS)) {
|
if (player.getItemInHand().getType().equals(Material.SHEARS)) {
|
||||||
|
@ -164,13 +164,13 @@ public class BlockListener implements Listener {
|
||||||
}
|
}
|
||||||
dispatchedCutQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, cutType,
|
dispatchedCutQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, cutType,
|
||||||
(final IQuester q, final IQuest cq) -> {
|
(final IQuester q, final IQuest cq) -> {
|
||||||
if (!dispatchedCutQuestIDs.contains(cq.getId())) {
|
if (!dispatchedCutQuestIDs.contains(cq.getId())) {
|
||||||
if (player.getItemInHand().getType().equals(Material.SHEARS)) {
|
if (player.getItemInHand().getType().equals(Material.SHEARS)) {
|
||||||
q.cutBlock(cq, blockItemStack);
|
q.cutBlock(cq, blockItemStack);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -269,45 +269,45 @@ public class BlockListener implements Listener {
|
||||||
// Ignore blocks replaced once broken (party support)
|
// Ignore blocks replaced once broken (party support)
|
||||||
dispatchedBreakQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, breakType,
|
dispatchedBreakQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, breakType,
|
||||||
(final IQuester q, final IQuest cq) -> {
|
(final IQuester q, final IQuest cq) -> {
|
||||||
if (!dispatchedBreakQuestIDs.contains(cq.getId())) {
|
if (!dispatchedBreakQuestIDs.contains(cq.getId())) {
|
||||||
for (final ItemStack is : q.getQuestData(cq).blocksBroken) {
|
for (final ItemStack is : q.getQuestData(cq).blocksBroken) {
|
||||||
if (event.getBlock().getType().equals(is.getType()) && is.getAmount() > 0) {
|
if (event.getBlock().getType().equals(is.getType()) && is.getAmount() > 0) {
|
||||||
ItemStack toBreak = new ItemStack(is.getType(), 64);
|
ItemStack toBreak = new ItemStack(is.getType(), 64);
|
||||||
for (final ItemStack stack : quester.getCurrentStage(cq).getBlocksToBreak()) {
|
for (final ItemStack stack : quester.getCurrentStage(cq).getBlocksToBreak()) {
|
||||||
if (ItemUtil.compareItems(is, stack, true) == 0) {
|
if (ItemUtil.compareItems(is, stack, true) == 0) {
|
||||||
toBreak = stack;
|
toBreak = stack;
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final QuesterPreUpdateObjectiveEvent preEvent
|
|
||||||
= new QuesterPreUpdateObjectiveEvent((Quester) q, cq,
|
|
||||||
new BukkitObjective(breakType, is.getAmount(), toBreak.getAmount()));
|
|
||||||
plugin.getServer().getPluginManager().callEvent(preEvent);
|
|
||||||
|
|
||||||
final int index = q.getQuestData(cq).blocksBroken.indexOf(is);
|
|
||||||
final int newAmount = is.getAmount() - 1;
|
|
||||||
is.setAmount(newAmount);
|
|
||||||
q.getQuestData(cq).blocksBroken.set(index, is);
|
|
||||||
|
|
||||||
final QuesterPostUpdateObjectiveEvent postEvent
|
|
||||||
= new QuesterPostUpdateObjectiveEvent((Quester) q, cq,
|
|
||||||
new BukkitObjective(breakType, newAmount, toBreak.getAmount()));
|
|
||||||
plugin.getServer().getPluginManager().callEvent(postEvent);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final QuesterPreUpdateObjectiveEvent preEvent
|
||||||
|
= new QuesterPreUpdateObjectiveEvent((Quester) q, cq,
|
||||||
|
new BukkitObjective(breakType, is.getAmount(), toBreak.getAmount()));
|
||||||
|
plugin.getServer().getPluginManager().callEvent(preEvent);
|
||||||
|
|
||||||
|
final int index = q.getQuestData(cq).blocksBroken.indexOf(is);
|
||||||
|
final int newAmount = is.getAmount() - 1;
|
||||||
|
is.setAmount(newAmount);
|
||||||
|
q.getQuestData(cq).blocksBroken.set(index, is);
|
||||||
|
|
||||||
|
final QuesterPostUpdateObjectiveEvent postEvent
|
||||||
|
= new QuesterPostUpdateObjectiveEvent((Quester) q, cq,
|
||||||
|
new BukkitObjective(breakType, newAmount, toBreak.getAmount()));
|
||||||
|
plugin.getServer().getPluginManager().callEvent(postEvent);
|
||||||
}
|
}
|
||||||
return null;
|
}
|
||||||
}));
|
}
|
||||||
|
return null;
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dispatchedPlaceQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, placeType,
|
dispatchedPlaceQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, placeType,
|
||||||
(final IQuester q, final IQuest cq) -> {
|
(final IQuester q, final IQuest cq) -> {
|
||||||
if (!dispatchedPlaceQuestIDs.contains(cq.getId())) {
|
if (!dispatchedPlaceQuestIDs.contains(cq.getId())) {
|
||||||
q.placeBlock(cq, blockItemStack);
|
q.placeBlock(cq, blockItemStack);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,7 +65,8 @@ public class ItemListener implements Listener {
|
||||||
quester.craftItem(quest, craftedItem);
|
quester.craftItem(quest, craftedItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, type, (final IQuester q, final IQuest cq) -> {
|
dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, type,
|
||||||
|
(final IQuester q, final IQuest cq) -> {
|
||||||
if (!dispatchedQuestIDs.contains(cq.getId())) {
|
if (!dispatchedQuestIDs.contains(cq.getId())) {
|
||||||
q.craftItem(cq, craftedItem);
|
q.craftItem(cq, craftedItem);
|
||||||
}
|
}
|
||||||
|
@ -119,7 +120,8 @@ public class ItemListener implements Listener {
|
||||||
quester.smeltItem(quest, event.getCurrentItem());
|
quester.smeltItem(quest, event.getCurrentItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, type, (final IQuester q, final IQuest cq) -> {
|
dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, type,
|
||||||
|
(final IQuester q, final IQuest cq) -> {
|
||||||
if (!dispatchedQuestIDs.contains(cq.getId())) {
|
if (!dispatchedQuestIDs.contains(cq.getId())) {
|
||||||
q.smeltItem(cq, event.getCurrentItem());
|
q.smeltItem(cq, event.getCurrentItem());
|
||||||
}
|
}
|
||||||
|
@ -142,7 +144,8 @@ public class ItemListener implements Listener {
|
||||||
quester.brewItem(quest, event.getCurrentItem());
|
quester.brewItem(quest, event.getCurrentItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, type, (final IQuester q, final IQuest cq) -> {
|
dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, type,
|
||||||
|
(final IQuester q, final IQuest cq) -> {
|
||||||
if (!dispatchedQuestIDs.contains(cq.getId())) {
|
if (!dispatchedQuestIDs.contains(cq.getId())) {
|
||||||
q.brewItem(cq, event.getCurrentItem());
|
q.brewItem(cq, event.getCurrentItem());
|
||||||
}
|
}
|
||||||
|
@ -180,7 +183,8 @@ public class ItemListener implements Listener {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, type, (final IQuester q, final IQuest cq) -> {
|
dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, type,
|
||||||
|
(final IQuester q, final IQuest cq) -> {
|
||||||
if (!dispatchedQuestIDs.contains(cq.getId())) {
|
if (!dispatchedQuestIDs.contains(cq.getId())) {
|
||||||
if (enchantedItem.getType().equals(Material.BOOK)) {
|
if (enchantedItem.getType().equals(Material.BOOK)) {
|
||||||
q.enchantBook(cq, enchantedItem, event.getEnchantsToAdd());
|
q.enchantBook(cq, enchantedItem, event.getEnchantsToAdd());
|
||||||
|
@ -216,7 +220,8 @@ public class ItemListener implements Listener {
|
||||||
quester.consumeItem(quest, consumedItem);
|
quester.consumeItem(quest, consumedItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, type, (final IQuester q, final IQuest cq) -> {
|
dispatchedQuestIDs.addAll(quester.dispatchMultiplayerEverything(quest, type,
|
||||||
|
(final IQuester q, final IQuest cq) -> {
|
||||||
if (!dispatchedQuestIDs.contains(cq.getId())) {
|
if (!dispatchedQuestIDs.contains(cq.getId())) {
|
||||||
q.consumeItem(cq, consumedItem);
|
q.consumeItem(cq, consumedItem);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue