diff --git a/data/conf/zones/fado.xml b/data/conf/zones/fado.xml index f889d01df72..93ec675edcc 100644 --- a/data/conf/zones/fado.xml +++ b/data/conf/zones/fado.xml @@ -1690,7 +1690,7 @@ For example say: 11 if you want the room called Water of Love. - + @@ -1715,7 +1715,7 @@ For example say: 11 if you want the room called Water of Love. - + @@ -1725,7 +1725,7 @@ For example say: 11 if you want the room called Water of Love. - + @@ -1806,7 +1806,7 @@ For example say: 11 if you want the room called Water of Love. - + @@ -1837,7 +1837,7 @@ For example say: 11 if you want the room called Water of Love. - + @@ -1846,7 +1846,7 @@ For example say: 11 if you want the room called Water of Love. - + @@ -1855,17 +1855,17 @@ For example say: 11 if you want the room called Water of Love. - + - + - + @@ -1944,8 +1944,8 @@ it back as you got it! - - + + @@ -1958,7 +1958,7 @@ it back as you got it! - + diff --git a/src/games/stendhal/client/UiRenderingMethod.java b/src/games/stendhal/client/UiRenderingMethod.java index a9914ffc9a7..5d4a4cbceed 100644 --- a/src/games/stendhal/client/UiRenderingMethod.java +++ b/src/games/stendhal/client/UiRenderingMethod.java @@ -17,7 +17,7 @@ /** * Enumeration of rendering methods. - * + * * @see JavaSE * 8 2D Technology @@ -25,7 +25,7 @@ * Project WakeField * @see MacOS Metal framework: * Project Lanai - * + * */ public enum UiRenderingMethod { diff --git a/src/games/stendhal/client/actions/AlterQuestAction.java b/src/games/stendhal/client/actions/AlterQuestAction.java index a6c983fa905..ee629a2b1b9 100644 --- a/src/games/stendhal/client/actions/AlterQuestAction.java +++ b/src/games/stendhal/client/actions/AlterQuestAction.java @@ -68,8 +68,6 @@ public int getMaximumParameters() { */ @Override public int getMinimumParameters() { - return 2; } - } diff --git a/src/games/stendhal/client/gui/j2d/entity/Item2DView.java b/src/games/stendhal/client/gui/j2d/entity/Item2DView.java index 4d42b7135c3..8c3d8544025 100644 --- a/src/games/stendhal/client/gui/j2d/entity/Item2DView.java +++ b/src/games/stendhal/client/gui/j2d/entity/Item2DView.java @@ -84,8 +84,8 @@ protected void buildRepresentation(T entity) { IGameScreen.SIZE_UNIT_PIXELS); if (width > IGameScreen.SIZE_UNIT_PIXELS) { - sprite = new AnimatedSprite(store.getTiles(sprite, 0, yOffset, - width / IGameScreen.SIZE_UNIT_PIXELS, + sprite = new AnimatedSprite(store.getTiles(sprite, 0, yOffset, + width / IGameScreen.SIZE_UNIT_PIXELS, IGameScreen.SIZE_UNIT_PIXELS, IGameScreen.SIZE_UNIT_PIXELS), 100, true); } else if (sprite.getHeight() > IGameScreen.SIZE_UNIT_PIXELS) { diff --git a/src/games/stendhal/client/update/Bootstrap.java b/src/games/stendhal/client/update/Bootstrap.java index 2954d486b40..0e2cb2145bc 100644 --- a/src/games/stendhal/client/update/Bootstrap.java +++ b/src/games/stendhal/client/update/Bootstrap.java @@ -282,7 +282,7 @@ private boolean isSigned() { Certificate[] certs = (Certificate[]) objects; for (Certificate cert : certs) { byte[] key = cert.getPublicKey().getEncoded(); - // Security Note: Since SourceForge has added support for https, + // Security Note: Since SourceForge has added support for https, // we do not depend on verifying the signature anymore. But we need // to tell an official and a self-build client apart in order not to // add incompatible .jar files to the later and break it. diff --git a/src/games/stendhal/server/core/engine/db/StendhalItemDAO.java b/src/games/stendhal/server/core/engine/db/StendhalItemDAO.java index fb75625036f..f98e5bd202a 100644 --- a/src/games/stendhal/server/core/engine/db/StendhalItemDAO.java +++ b/src/games/stendhal/server/core/engine/db/StendhalItemDAO.java @@ -190,7 +190,7 @@ private void dump(PreparedStatement stmt, DefaultItem item) throws SQLException stmt.setString(27, item.getAttributes().get("persistent")); stmt.setString(28, item.getAttributes().get("slot_name")); stmt.setString(29, item.getAttributes().get("slot_size")); - + stmt.setString(30, item.getAttributes().get("undroppableondeath")); stmt.setInt(31, MathHelper.parseIntDefault(item.getAttributes().get("autobind"), 0)); stmt.setString(32, item.getAttributes().get("max_quantity")); @@ -285,4 +285,3 @@ public Map getItemInfoIdMap(DBTransaction transaction) throws S return transaction.queryAsMap("SELECT name, id FROM iteminfo", null); } } - diff --git a/src/games/stendhal/server/core/rp/group/GroupManager.java b/src/games/stendhal/server/core/rp/group/GroupManager.java index c57f1361c51..71ee1bb6685 100644 --- a/src/games/stendhal/server/core/rp/group/GroupManager.java +++ b/src/games/stendhal/server/core/rp/group/GroupManager.java @@ -122,7 +122,7 @@ public void onLoggedIn(Player player) { if (group != null) { // TODO: Workaround because RPEvents might be lost in Perceptions for on objects added to zone in that turn TurnNotifier.get().notifyInTurns(0, new TurnListener() { - + @Override public void onTurnReached(int currentTurn) { group.sendGroupChangeEvent(player); diff --git a/src/games/stendhal/server/entity/item/RingOfLife.java b/src/games/stendhal/server/entity/item/RingOfLife.java index 6a57f5a2f04..43d437a08c7 100644 --- a/src/games/stendhal/server/entity/item/RingOfLife.java +++ b/src/games/stendhal/server/entity/item/RingOfLife.java @@ -45,7 +45,7 @@ public RingOfLife() { put("amount", 1); updateState(); } - + private void updateState() { if (isBroken()) { setState(1); diff --git a/src/games/stendhal/server/entity/npc/ConversationPhrases.java b/src/games/stendhal/server/entity/npc/ConversationPhrases.java index c685782e15f..1270ad383dd 100644 --- a/src/games/stendhal/server/entity/npc/ConversationPhrases.java +++ b/src/games/stendhal/server/entity/npc/ConversationPhrases.java @@ -64,7 +64,7 @@ public class ConversationPhrases { public static final List PURCHASE_MESSAGES = Arrays.asList("buy", "purchase"); - public static final ImmutableSet KNOWN = ImmutableSet.of("hello", "help", "job", + public static final ImmutableSet KNOWN = ImmutableSet.of("hello", "help", "job", "task", "done", "another", "offer", "yes", "no", "bye", "buy", "sell"); /** diff --git a/src/games/stendhal/server/entity/npc/quest/DeliverItemOrder.java b/src/games/stendhal/server/entity/npc/quest/DeliverItemOrder.java index 31e0430aa0c..c528d57ea85 100644 --- a/src/games/stendhal/server/entity/npc/quest/DeliverItemOrder.java +++ b/src/games/stendhal/server/entity/npc/quest/DeliverItemOrder.java @@ -23,7 +23,7 @@ public class DeliverItemOrder { /** A hint where to find the customer. */ private String npcDescription; - + /** The style the customer likes. */ private String flavor; @@ -156,4 +156,4 @@ public DeliverItemOrder playerMinLevel(int minLevel) { } -} \ No newline at end of file +} diff --git a/src/games/stendhal/server/entity/npc/quest/DeliverItemQuestCompleteBuilder.java b/src/games/stendhal/server/entity/npc/quest/DeliverItemQuestCompleteBuilder.java index 1f10b35e4e4..6d79d41ada5 100644 --- a/src/games/stendhal/server/entity/npc/quest/DeliverItemQuestCompleteBuilder.java +++ b/src/games/stendhal/server/entity/npc/quest/DeliverItemQuestCompleteBuilder.java @@ -57,7 +57,7 @@ private class HandOverItemAction implements ChatAction { public HandOverItemAction(DeliverItemTask deliverItemTask, String questSlot) { this.deliverItemTask = deliverItemTask; - this.questSlot= questSlot; + this.questSlot= questSlot; } @Override diff --git a/src/games/stendhal/server/entity/npc/quest/DeliverItemQuestOfferBuilder.java b/src/games/stendhal/server/entity/npc/quest/DeliverItemQuestOfferBuilder.java index 0d6271c2d5f..ece287393fd 100644 --- a/src/games/stendhal/server/entity/npc/quest/DeliverItemQuestOfferBuilder.java +++ b/src/games/stendhal/server/entity/npc/quest/DeliverItemQuestOfferBuilder.java @@ -95,7 +95,7 @@ public void build(SpeakerNPC npc, String questSlot, QuestTaskBuilder task, ChatC ConversationStates.QUEST_OFFERED, respondToRepeatedRequest, null); - + npc.add(ConversationStates.ATTENDING, ConversationPhrases.QUEST_MESSAGES, new AndCondition( @@ -156,7 +156,7 @@ public void build(SpeakerNPC npc, String questSlot, QuestTaskBuilder task, ChatC entry.getValue(), null); } - + ((DeliverItemTask) task).prepareBaker(); } diff --git a/src/games/stendhal/server/entity/npc/quest/QuestOfferBuilder.java b/src/games/stendhal/server/entity/npc/quest/QuestOfferBuilder.java index 527bc2fac3c..08d305b5a9b 100644 --- a/src/games/stendhal/server/entity/npc/quest/QuestOfferBuilder.java +++ b/src/games/stendhal/server/entity/npc/quest/QuestOfferBuilder.java @@ -185,7 +185,7 @@ public void build(SpeakerNPC npc, String questSlot, QuestTaskBuilder task, ChatC ConversationStates.QUEST_OFFERED, respondToRepeatedRequest, null); - + npc.add(ConversationStates.ATTENDING, ConversationPhrases.QUEST_MESSAGES, diff --git a/src/games/stendhal/server/entity/npc/quest/QuestTaskBuilder.java b/src/games/stendhal/server/entity/npc/quest/QuestTaskBuilder.java index f6d7af98aa5..63a9689dc2e 100644 --- a/src/games/stendhal/server/entity/npc/quest/QuestTaskBuilder.java +++ b/src/games/stendhal/server/entity/npc/quest/QuestTaskBuilder.java @@ -37,7 +37,7 @@ ChatCondition buildQuestPreCondition(@SuppressWarnings("unused") String questSlo } abstract ChatAction buildStartQuestAction(String questSlot); - + ChatAction buildRejectQuestAction(@SuppressWarnings("unused") String questSlot) { return null; } diff --git a/src/games/stendhal/server/entity/npc/shop/package-info.java b/src/games/stendhal/server/entity/npc/shop/package-info.java index b0135de39b2..f31e09c9fb7 100644 --- a/src/games/stendhal/server/entity/npc/shop/package-info.java +++ b/src/games/stendhal/server/entity/npc/shop/package-info.java @@ -8,4 +8,4 @@ * (at your option) any later version. * * * ***************************************************************************/ -package games.stendhal.server.entity.npc.shop; \ No newline at end of file +package games.stendhal.server.entity.npc.shop; diff --git a/src/games/stendhal/server/events/ChatOptionsEvent.java b/src/games/stendhal/server/events/ChatOptionsEvent.java index a0f3fb7966b..c2a2a327d4c 100644 --- a/src/games/stendhal/server/events/ChatOptionsEvent.java +++ b/src/games/stendhal/server/events/ChatOptionsEvent.java @@ -56,7 +56,7 @@ private static class ChatOption implements Comparable { SORT_INDEX.put("Sell ...", 35); SORT_INDEX.put("Bye", 9999); } - + private String trigger; private String label; private String options = ""; diff --git a/src/games/stendhal/server/maps/quests/PizzaDelivery.java b/src/games/stendhal/server/maps/quests/PizzaDelivery.java index b0b84cfb8ab..2a3b53ca29f 100644 --- a/src/games/stendhal/server/maps/quests/PizzaDelivery.java +++ b/src/games/stendhal/server/maps/quests/PizzaDelivery.java @@ -123,7 +123,7 @@ public DeliverItemQuestBuilder story() { .customerDescription("Cyk is currently on holiday on Athor Island. You'll easily recognize him by his blue hair. Go South East to find Athor ferry.") .itemDescription("Pizza Hawaii") // You need about 6 min to Eliza, up to 12 min to wait for the - // ferry, 5 min for the crossing, and 0.5 min from the docks to + // ferry, 5 min for the crossing, and 0.5 min from the docks to // the beach, so you need a bit of luck for this one. .minutesToDeliver(20) .tipOnFastDelivery(300) diff --git a/src/games/stendhal/server/script/ChangeDaytime.java b/src/games/stendhal/server/script/ChangeDaytime.java index 48581eb14c0..18e1d1a1738 100644 --- a/src/games/stendhal/server/script/ChangeDaytime.java +++ b/src/games/stendhal/server/script/ChangeDaytime.java @@ -22,7 +22,7 @@ /** * Changes the global day time to specified phase. Intended for testing night - * time map coloring. Calling with parameter "reset" restores the normal timed + * time map coloring. Calling with parameter "reset" restores the normal timed * behavior. */ public class ChangeDaytime extends ScriptImpl { @@ -32,7 +32,7 @@ public void execute(Player admin, List args) { usage(admin); return; } - + if (!setPhase(args.get(0))) { usage(admin); } diff --git a/src/games/stendhal/server/script/ExtendedSummonAt.java b/src/games/stendhal/server/script/ExtendedSummonAt.java index 89865028869..dff6baedca6 100644 --- a/src/games/stendhal/server/script/ExtendedSummonAt.java +++ b/src/games/stendhal/server/script/ExtendedSummonAt.java @@ -128,7 +128,7 @@ public void execute(Player admin, List args) { admin.sendPrivateText(NotificationType.ERROR, "The slot is full."); return; } - + new GameEvent(admin.getName(), SUMMONAT, changed.getName(), slotName, type, "logid: "+ action.get("logid")).raise(); item.put("logid", action.get("logid")); SingletonRepository.getRuleProcessor().sendMessageToSupporters(admin.getName() + " summoned " diff --git a/srcjs/stendhal/data/ImageWithDimensions.ts b/srcjs/stendhal/data/ImageWithDimensions.ts index 3305bf6de83..e7c9e5d10b4 100644 --- a/srcjs/stendhal/data/ImageWithDimensions.ts +++ b/srcjs/stendhal/data/ImageWithDimensions.ts @@ -12,4 +12,4 @@ export interface ImageWithDimensions { height: number; width: number -} \ No newline at end of file +} diff --git a/srcjs/stendhal/ui/dialog/TradeDialog.ts b/srcjs/stendhal/ui/dialog/TradeDialog.ts index 6cb2a9336a8..691866241d5 100644 --- a/srcjs/stendhal/ui/dialog/TradeDialog.ts +++ b/srcjs/stendhal/ui/dialog/TradeDialog.ts @@ -65,7 +65,7 @@ export class TradeDialog extends DialogContentComponent { (this.child("#trade-offer") as HTMLButtonElement).disabled = !(myState === "MAKING_OFFERS"); (this.child("#trade-accept") as HTMLButtonElement).disabled = !(myState === "LOCKED" && (partnerState === "LOCKED" || partnerState === "DEAL_WAITING_FOR_OTHER_DEAL")); - + this.otherItemsComponent.setObject(partner ? partner : TradeDialog.empty); this.myItemsComponent.setObject(me); if (myState === "TRADE_COMPLETED") { @@ -79,7 +79,7 @@ export class TradeDialog extends DialogContentComponent { } private createHtml() { - + this.child("#trade-partner-items")!.append(this.otherItemsComponent.componentElement); this.child("#trade-my-items")!.append(this.myItemsComponent.componentElement); this.child("#trade-accept")!.addEventListener("click", () => { @@ -128,5 +128,5 @@ export class TradeDialog extends DialogContentComponent { }; marauroa.clientFramework.sendAction(action); } - + } diff --git a/srcjs/stendhal/ui/toolkit/FloatingWindow.ts b/srcjs/stendhal/ui/toolkit/FloatingWindow.ts index e0b7ce70640..06b416ce6cb 100644 --- a/srcjs/stendhal/ui/toolkit/FloatingWindow.ts +++ b/srcjs/stendhal/ui/toolkit/FloatingWindow.ts @@ -171,7 +171,7 @@ export class FloatingWindow extends Component { const dialogArea = this.componentElement.getBoundingClientRect(); const clientArea = document.documentElement.getBoundingClientRect(); - // clientArea.height is 0, if there are now child elements (e. g. on login / choose character dialogs) + // clientArea.height is 0, if there are now child elements (e. g. on login / choose character dialogs) let clientAreaHeight = clientArea.height; if (clientAreaHeight == 0) { clientAreaHeight = window.visualViewport?.height || 200;