From 5b220226813fcb9b6a5236a14789234f7f26b396 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 26 Apr 2010 19:27:39 +0000 Subject: [PATCH 01/15] increased version numbers --- build.ant.properties | 4 ++-- runserver.bat | 2 +- runserver.sh | 2 +- src/games/stendhal/client/update/Version.java | 2 +- src/games/stendhal/common/Debug.java | 2 +- src/games/stendhal/server/core/engine/GenerateINI.java | 2 +- stendhal.jnlp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.ant.properties b/build.ant.properties index 50a7debb4c..c998079f95 100644 --- a/build.ant.properties +++ b/build.ant.properties @@ -75,8 +75,8 @@ updates_server = http://arianne.sourceforge.net/stendhal/updates version_server = http://arianne.sourceforge.net/stendhal.version # current version of stendhal -version.old = 0.81 -version = 0.82.5 +version.old = 0.82 +version = 0.82.8 # javac options javac.deprecation = true diff --git a/runserver.bat b/runserver.bat index 61ae7283f7..168604f2f7 100644 --- a/runserver.bat +++ b/runserver.bat @@ -1,3 +1,3 @@ -set STENDHAL_VERSION=0.82.5 +set STENDHAL_VERSION=0.82.8 set LOCALCLASSPATH=.;data\script;data\conf;stendhal-server-%STENDHAL_VERSION%.jar;marauroa.jar;mysql-connector.jar;log4j.jar;commons-lang.jar;h2.jar java -Xmx400m -cp "%LOCALCLASSPATH%" marauroa.server.marauroad -c server.ini -l diff --git a/runserver.sh b/runserver.sh index df2c13de2e..d31a2852bb 100644 --- a/runserver.sh +++ b/runserver.sh @@ -1,5 +1,5 @@ #!/bin/sh -STENDHAL_VERSION="0.82.5" +STENDHAL_VERSION="0.82.8" LOCALCLASSPATH=.:data/script/:data/conf/:stendhal-server-$STENDHAL_VERSION.jar:marauroa.jar:mysql-connector.jar:log4j.jar:commons-lang.jar:h2.jar diff --git a/src/games/stendhal/client/update/Version.java b/src/games/stendhal/client/update/Version.java index 1c6b91fdd5..326d6bb9f0 100644 --- a/src/games/stendhal/client/update/Version.java +++ b/src/games/stendhal/client/update/Version.java @@ -10,7 +10,7 @@ package games.stendhal.client.update; public class Version { /** Version Number. */ - public static final String VERSION = "0.82.5"; + public static final String VERSION = "0.82.8"; /** * Extract the specified number of parts from a version-string. diff --git a/src/games/stendhal/common/Debug.java b/src/games/stendhal/common/Debug.java index 92d22db980..e1d1aece30 100644 --- a/src/games/stendhal/common/Debug.java +++ b/src/games/stendhal/common/Debug.java @@ -25,7 +25,7 @@ public interface Debug { /** server version. */ // Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line. - String VERSION = "0.82.5"; + String VERSION = "0.82.8"; /** diff --git a/src/games/stendhal/server/core/engine/GenerateINI.java b/src/games/stendhal/server/core/engine/GenerateINI.java index 03762b5d27..6e16487e83 100644 --- a/src/games/stendhal/server/core/engine/GenerateINI.java +++ b/src/games/stendhal/server/core/engine/GenerateINI.java @@ -233,7 +233,7 @@ public class GenerateINI { out.println(); out.println("server_typeGame=" + gameName); out.println("server_name=" + gameName + " Marauroa server"); - out.println("server_version=0.82.5"); + out.println("server_version=0.82.8"); out.println("server_contact=https://sourceforge.net/tracker/?atid=514826&group_id=66537&func=browse"); out.println(); out.println("# Extensions configured on the server. Enable at will."); diff --git a/stendhal.jnlp b/stendhal.jnlp index f209acb901..e354911e09 100644 --- a/stendhal.jnlp +++ b/stendhal.jnlp @@ -22,7 +22,7 @@ Some of these people are NPC, they will give you tasks to accomplish and hints t - + From 33bd3668b37f751bb9be522d91f4094f6f2dd128 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 26 Apr 2010 22:00:52 +0000 Subject: [PATCH 02/15] backported Put a small x2 next to the cog to show you have to double click to use by kymara --- data/sprites/cursor/itemuse.png | Bin 442 -> 476 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/sprites/cursor/itemuse.png b/data/sprites/cursor/itemuse.png index 313ca4c643acaa3955ec8e8b3500ea55fe87ee8e..46ea5d81ba78baf3a0b7e2530ecc6596d293fa76 100644 GIT binary patch delta 368 zcmV-$0gwK=1Kb0UHwFKPkIcW3JRk@f6)Fo?0r2UOWF~(-Nkl*7q4um*PBuwQ31_0ur3;@Jq832ey832f6NgVG-v#T+GhN$+*k3j1kO>NTkb!5O=}g;f{Lwlh zkdf+tZ_M=`8_KJMIFCIdsFJlA0qJmB>RVs*U89@n1$DIAY96+aj*iYW0Fy;9-r_Rx zRcqDc6>PiPoK`v|&S^7=`4JvuAQDx#S6N7stb!*BMgc}u5OOFdhj4l5 z#yEJ?ftG}2+zIc?*xu5T-CRSRlqidLyjP98fSqh^oz8ndCJYtse~drp*7@UbDE-+0 O0000S z0oeFvN5rHQA!iCGux)%F1K9W>2C(rg2C(sC3}EA@7{JEQF@TNdy9Tj*_F0T6q^hdL zOnX2^HV%Ivz{Tp6_rdbB(*0behA+394JUJ3fw)l4rR4SZU)l#t=cWSX$~oe5^YSO{ zOcz4|Z)%vp9cLWy2E0gyV@;dR$*A>GY3vf4^UWbAe3S{U{g&*uxBjXwzp9R9Z8!G5 zV##!~u9t?CN#!4h($07*qoM6N<$g3th>y#N3J From 15b608f86eb0b1786a0d8762f4abd6d69470f633 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 26 Apr 2010 22:01:11 +0000 Subject: [PATCH 03/15] backported "Suppress warning to player that an item taken from a slot doesn't exist there any more (usually this is just going to happen in error - or that someone else looted an item from a corpse first). Also drop to debug. level the warning that someone tried to take an item from a raid corpse belonging to another." by kymara --- src/games/stendhal/server/actions/equip/SourceObject.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/games/stendhal/server/actions/equip/SourceObject.java b/src/games/stendhal/server/actions/equip/SourceObject.java index 9bea562196..7ba573794c 100644 --- a/src/games/stendhal/server/actions/equip/SourceObject.java +++ b/src/games/stendhal/server/actions/equip/SourceObject.java @@ -89,8 +89,9 @@ class SourceObject extends MoveableObject { if (!baseSlot.has(baseItemId)) { logger.debug("Base item(" + parent + ") doesn't contain item(" + baseItemId + ") on given slot(" + slotName + ")"); - player.sendPrivateText("There is no such item in the " + slotName + " of " - + parent.getDescriptionName(true)); + // Remove message as discussed on #arianne 2010-04-25 + // player.sendPrivateText("There is no such item in the " + slotName + " of " + // + parent.getDescriptionName(true)); return invalidSource; } From 27d06d3300ea3f0a1bd54993538776a3486ea121 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 26 Apr 2010 22:01:35 +0000 Subject: [PATCH 04/15] backported "commented code for making unique noises for archrats due to problems with casting - these noises would implement to all archrats in game" by yoriy --- src/games/stendhal/server/maps/quests/ThePiedPiper.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/games/stendhal/server/maps/quests/ThePiedPiper.java b/src/games/stendhal/server/maps/quests/ThePiedPiper.java index 8e48793d59..5aecca7cf7 100644 --- a/src/games/stendhal/server/maps/quests/ThePiedPiper.java +++ b/src/games/stendhal/server/maps/quests/ThePiedPiper.java @@ -21,10 +21,7 @@ import games.stendhal.server.entity.npc.SpeakerNPC; import games.stendhal.server.entity.npc.parser.Sentence; import games.stendhal.server.entity.player.Player; -import java.lang.Math; - import java.util.Arrays; -import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Observable; @@ -560,6 +557,7 @@ import org.apache.log4j.Logger; } // spawn creature rat.registerObjectsForNotification(ratsObserver); + /* -- commented because of these noises reflects on all archrats in game -- // add unique noises to humanoids if (tc==RAT_TYPES.indexOf("archrat")) { final LinkedList ll = new LinkedList( @@ -573,6 +571,7 @@ import org.apache.log4j.Logger; lhm.put("follow", ll); rat.setNoises(lhm); }; + */ StendhalRPAction.placeat(zone, rat, x, y); rats.add(rat); }; From e68f8dd3bf39a8b5faa58ece0c743b97407bceee Mon Sep 17 00:00:00 2001 From: Kimmo Rundelin Date: Mon, 26 Apr 2010 22:05:49 +0000 Subject: [PATCH 05/15] minor transparency fix --- tiled/interiors/ados/tavern_0.tmx | 67 ++++++++++++++++--------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/tiled/interiors/ados/tavern_0.tmx b/tiled/interiors/ados/tavern_0.tmx index 40c44c2238..b060b3b459 100644 --- a/tiled/interiors/ados/tavern_0.tmx +++ b/tiled/interiors/ados/tavern_0.tmx @@ -1,112 +1,113 @@ - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - H4sIAAAAAAAAADNjYGAwG2DMSiUMMouBRPVmaHxq0Mhm4/MzOptSO9HFQVgKiOXQsCyN/I8tbOvRML39T2z408r/Ax3/9UTaP1zTP73i/yYS/+II9P9gTf/09P9ITv+U+p9YTEg9PnlS0ykhe6iBAQeYFR+ACQAA + H4sIAAAAAAAAAzNjYGAwG2DMSiUMMouBRPVmaHxq0Mhm4/MzOptSO9HFQVgKiOXQsCyN/I8tbOvRML39T2z408r/Ax3/9UTaP1zTPz3jf6T7fzCm/9H4Hxr+JxYTUo9PntR0SsgeamAAz3Seg4AJAAA= - H4sIAAAAAAAAAL2TTQrCMBCFE90pdSfYlbryTq6rC68gaFU8g5uC7vw7jcueRl8kgTA0cZK2DnwU2sm894a0EEKcG+ICisD+K7iBe00eoCv580z/G8+XqF8leOo8nHml5bcpfZpnDU4OjN8282/AGEwscjAV/8mv9LeEnPhtO79Pv+n8tn6m9RcefZo/0/3LSP3Q/XPyp2DO1A/dP/d/VfpDhgdanPz2vlxZVwytpvLHZo29/778IV7ovJShX5Xf7Jp772z9uvlpGS9Hpj7NvwN7wsHjN6aUx5Fjnuvezohfgadk8m2veN+Rv+fZZ01/D/QZJBpViaxmoOe5vtOzqv8D8mte4oAJAAA= + H4sIAAAAAAAAA72TTQrCMBCFE90puhPsSl15J9fVhVcQtCqewU1Bd/6dxmVPoy+SQBiadJo2DnwE2sm899I0F0JcWuIK8pr9N3AHj4Y8QVfy55n+D9a3aF4FeOk8nHmF5bctfZpnA84OjN+Y+bdgAqYWGZiJ/+RX+jtCRvzGzu/Tj5k/1fpLjz7Nn+r+VaB+jPwJWETS5/6vSn/E0DdVJ799/q6s6wpt17yQ/JysLv2Q7+/LX8cLnZcw9Mvym7Pm3jtbv2l+WsbLialP8+/BgXD0+A0p5XHsmOe6t3PiV2CVTH7tJc87snqevdf090CfwUCjaiDLGep5rvd0r+r/ArngtJ6ACQAA - H4sIAAAAAAAAAMWVOQ7CMBBF00LFnnTsEmdg39cb0ENDRcMdoACOzEdyJMvyPlbypSfHk/n5mShRoih7dXPI5NWT1DoMHxUltYGmv6/I55Vo/LpzMr3Bi9s/Nb0lUAVljoqkltZrhuwmaDEStrYNHtV8rnPnrYaw2vaH0gXE4Oroi4V96Pty1d2iZwhGYAwmhCzfWRdgCVZgTch/ePr24ACO4ETIvxG8ony+1y93/CHmn4l+6rP459eJ1zBJ9766zF9Q1GX/Nhv5+nSaghmYZ+xNtQFbsAvo/QFHkI4pgAkAAA== + H4sIAAAAAAAAA8WVOQ7CMBBF00LFnnTsEmdg39cb0ENDRcMdoACOzEdyJMvyPlbypSfHk/n5mShRoih7dXPI5NWT1DoMHxUltYGmv6/I55Vo/LpzMr3Bi9s/Nb0lUAVljoqkltZrhuwmaDEStrYNHtV8rnPnrYaw2vaH0gXE4Oroi4V96Pty1d2iZwhGYAwmhCzfWRdgCVZgTch/ePr24ACO4ETIvxG8ony+1y93/CHmn4l+6rP459eJ1zBJ9766zF9Q1GX/Nhv5+nSaghmYZ+xNtQFbsAvo/QFHkI4pgAkAAA== - H4sIAAAAAAAAAGNgwASaWMTIAdpUMmckAW4g5gNiHiTMi0UMJs4/MM4cBQRAGBCHQ3EEiXqIVU8vEDnQDqAjoMSv/kAcQC2HDAJAabwPdLpRo5I5LWTq66KS/fgAvjAup4P9o4AyAAC+EsVYgAkAAA== + H4sIAAAAAAAAA2NgwASaWMTIAdpUMmckAW4g5gNiHiTMi0UMJs4/MM4cBQRAGBCHQ3EEiXqIVU8vEDnQDqAjoMSv/kAcQC2HDAJAabwPdLpRo5I5LWTq66KS/fgAvjAup4P9o4AyAAC+EsVYgAkAAA== - H4sIAAAAAAAAAGNgGAWDCeQjsXOAeAKafC+U7qGPc0YBhaCCRPXFNHEFZSCfsJJBAfyBOGCgHTEKhh1oG2gHjIJhCwBO2VhvgAkAAA== + H4sIAAAAAAAAA2NgGAWDCeQjsXOAeAKafC+U7qGPc0YBhaCCRPXFNHEFZSCfsJJBAfyBOGCgHTEKhh1oG2gHjIJhCwBO2VhvgAkAAA== - H4sIAAAAAAAAAGNgGAWjYBSMglEwCkbBKBjcwGCA9NIKAAAnhrUUgAkAAA== + H4sIAAAAAAAAA2NgGAWjYBSMglEwCkbBKBjcwGCA9NIKAAAnhrUUgAkAAA== - H4sIAAAAAAAAADNmYGAwHsVwTA4g1Sxq2o3LTEJ2UaoeXS+pfqGm30ftJz1dE4pDSu2npnpahCe17ScV4Mt/1DRvKNtPiltwpWdS7UdXM5D2k+IOWtlPrNuILXfwqSUGU6KfUrtpgQFxdyhtgAkAAA== + H4sIAAAAAAAAAzNmYGAwHsVwTA4g1Sxq2o3LTEJ2UaoeXS+pfqGm30ftJz1dE4pDSu2npnpahCe17ScV4Mt/1DRvKNtPiltwpWdS7UdXM5D2k+IOWtlPrNuILXfwqSUGU6KfUrtpgQFxdyhtgAkAAA== - H4sIAAAAAAAAAO3BMQEAAADCoPVPbQsvoAAAeBoUK4qJgAkAAA== + H4sIAAAAAAAAA+3BMQEAAADCoPVPbQsvoAAAeBoUK4qJgAkAAA== From 4e4bb78a41c78f1933c83ab99548583f6de325e5 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 27 Apr 2010 05:59:14 +0000 Subject: [PATCH 06/15] deleted test for deleted error message --- .../actions/equip/EquipmentActionTest.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/tests/games/stendhal/server/actions/equip/EquipmentActionTest.java b/tests/games/stendhal/server/actions/equip/EquipmentActionTest.java index 1624481900..1a75450859 100644 --- a/tests/games/stendhal/server/actions/equip/EquipmentActionTest.java +++ b/tests/games/stendhal/server/actions/equip/EquipmentActionTest.java @@ -60,23 +60,6 @@ public class EquipmentActionTest extends ZoneAndPlayerTestImpl { return player; } - /** - * Tests for dropInvalidSourceSlot. - */ - @Test - public void testDropInvalidSourceSlot() { - final Player player = createTestPlayer("george"); - - final RPAction drop = new RPAction(); - drop.put("type", "drop"); - drop.put("baseobject", player.getID().getObjectID()); - drop.put("baseslot", "nonExistingSlotXXXXXX"); - drop.put("baseitem", -1); - - final EquipmentAction action = new DropAction(); - action.onAction(player, drop); - Assert.assertEquals("Source nonExistingSlotXXXXXX does not exist", player.events().get(0).get("text")); - } /** * Tests for dropNonExistingItem. From 3d6fc09232bfbea1b1c29cccee82db066f10da0c Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Tue, 27 Apr 2010 19:06:54 +0000 Subject: [PATCH 07/15] backported fix for walking into orbs --- src/games/stendhal/client/entity/Door.java | 10 ++++++++++ src/games/stendhal/client/entity/Portal.java | 10 ++++++++++ .../stendhal/client/gui/j2d/entity/Door2DView.java | 8 ++++++-- .../stendhal/client/gui/j2d/entity/Portal2DView.java | 9 +++++++-- .../stendhal/server/entity/mapstuff/portal/Portal.java | 9 ++++++++- 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/games/stendhal/client/entity/Door.java b/src/games/stendhal/client/entity/Door.java index d6e73fcdc2..eb439b465a 100644 --- a/src/games/stendhal/client/entity/Door.java +++ b/src/games/stendhal/client/entity/Door.java @@ -32,6 +32,7 @@ public class Door extends Entity { * Create a door entity. */ public Door() { + // default constructor } // @@ -114,4 +115,13 @@ public class Door extends Entity { fireChange(PROP_OPEN); } } + + /** + * Is this entity useable? + * + * @return true if it is useable, false otherwise + */ + public boolean isUseable() { + return rpObject.has("use"); + } } diff --git a/src/games/stendhal/client/entity/Portal.java b/src/games/stendhal/client/entity/Portal.java index 1dcdb68fb7..8ceb529825 100644 --- a/src/games/stendhal/client/entity/Portal.java +++ b/src/games/stendhal/client/entity/Portal.java @@ -93,4 +93,14 @@ public class Portal extends InvisibleEntity { hidden = false; } } + + + /** + * Is this entity useable? + * + * @return true if it is useable, false otherwise + */ + public boolean isUseable() { + return rpObject.has("use"); + } } diff --git a/src/games/stendhal/client/gui/j2d/entity/Door2DView.java b/src/games/stendhal/client/gui/j2d/entity/Door2DView.java index 9b63464522..0819343ea5 100644 --- a/src/games/stendhal/client/gui/j2d/entity/Door2DView.java +++ b/src/games/stendhal/client/gui/j2d/entity/Door2DView.java @@ -231,12 +231,16 @@ class Door2DView extends StateEntity2DView { @Override public boolean isInteractive() { - return false; + return ((Door) entity).isUseable(); } @Override public StendhalCursor getCursor() { - return StendhalCursor.PORTAL; + if (isInteractive()) { + return StendhalCursor.ACTIVITY; + } else { + return StendhalCursor.PORTAL; + } } } diff --git a/src/games/stendhal/client/gui/j2d/entity/Portal2DView.java b/src/games/stendhal/client/gui/j2d/entity/Portal2DView.java index 1103424a37..9bd31231e2 100644 --- a/src/games/stendhal/client/gui/j2d/entity/Portal2DView.java +++ b/src/games/stendhal/client/gui/j2d/entity/Portal2DView.java @@ -75,14 +75,19 @@ class Portal2DView extends InvisibleEntity2DView { } } + @Override public boolean isInteractive() { - return false; + return ((Portal) entity).isUseable(); } @Override public StendhalCursor getCursor() { - return StendhalCursor.PORTAL; + if (isInteractive()) { + return StendhalCursor.ACTIVITY; + } else { + return StendhalCursor.PORTAL; + } } } diff --git a/src/games/stendhal/server/entity/mapstuff/portal/Portal.java b/src/games/stendhal/server/entity/mapstuff/portal/Portal.java index e68db21bbf..bb6fab7afc 100644 --- a/src/games/stendhal/server/entity/mapstuff/portal/Portal.java +++ b/src/games/stendhal/server/entity/mapstuff/portal/Portal.java @@ -41,6 +41,7 @@ public class Portal extends Entity implements UseListener { * The hidden flags attribute name. */ protected static final String ATTR_HIDDEN = "hidden"; + protected static final String ATTR_USE = "use"; /** the logger instance. */ private static final Logger logger = Logger.getLogger(Portal.class); @@ -58,6 +59,7 @@ public class Portal extends Entity implements UseListener { if (!RPClass.hasRPClass(RPCLASS_NAME)){ final RPClass portal = new RPClass(RPCLASS_NAME); portal.isA("entity"); + portal.addAttribute(ATTR_USE, Type.FLAG); portal.addAttribute(ATTR_HIDDEN, Type.FLAG); } } catch (final SyntaxException e) { @@ -179,7 +181,12 @@ public class Portal extends Entity implements UseListener { player.sendPrivateText("For some reason you cannot get through right now."); return false; } - + + if (!nextTo(player) && has("use")) { + player.sendPrivateText("You must come closer before you can use this orb."); + return false; + } + if (!nextTo(player)) { // Too far to use the portal from here, but walk to it // The pathfinder will do the rest of the work and make the player pass through the portal From 289f392a4b1745ff861deac9ac664daffeb1db75 Mon Sep 17 00:00:00 2001 From: Katie Russell Date: Tue, 27 Apr 2010 19:09:13 +0000 Subject: [PATCH 08/15] backported use attribute for orbs --- data/conf/zones/kalavan.xml | 1 + data/conf/zones/orril.xml | 3 +++ data/conf/zones/semos.xml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/data/conf/zones/kalavan.xml b/data/conf/zones/kalavan.xml index c924e6df61..29f9a660e7 100644 --- a/data/conf/zones/kalavan.xml +++ b/data/conf/zones/kalavan.xml @@ -335,6 +335,7 @@ 2 2 + - + From e6f1094d934296c7c91104122edb48fcc4f8a167 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Thu, 29 Apr 2010 20:20:16 +0000 Subject: [PATCH 11/15] backported fix by kymara: Explicitly set the level to 0 for a brand new player so that they get the first level up message to Level 1 --- src/games/stendhal/server/entity/player/Player.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/games/stendhal/server/entity/player/Player.java b/src/games/stendhal/server/entity/player/Player.java index 821d71b7a1..c902db876a 100644 --- a/src/games/stendhal/server/entity/player/Player.java +++ b/src/games/stendhal/server/entity/player/Player.java @@ -155,9 +155,9 @@ public class Player extends RPEntity { player.put("atk_xp", 0); player.put("def", 10); player.put("def_xp", 0); + player.put("level", 0); player.setXP(0); - final Outfit randomoutfit = Outfit.getRandomOutfit(); player.setOutfit(randomoutfit); From 662c4cea56a86bed576c3a8486ee2ccdb9674566 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Thu, 29 Apr 2010 20:46:05 +0000 Subject: [PATCH 12/15] diff music .jar --- release.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/release.xml b/release.xml index f0dcfd5f98..437148de05 100644 --- a/release.xml +++ b/release.xml @@ -46,7 +46,7 @@ - @@ -67,6 +67,14 @@ + + + + + + + + From 4dc66fe9e551f957cba863e2698c8d4dc2a7e9c6 Mon Sep 17 00:00:00 2001 From: Kimmo Rundelin Date: Thu, 29 Apr 2010 22:45:47 +0000 Subject: [PATCH 13/15] Fixed sparkles that ended up in wrong frames --- data/sprites/combat/blade_strike_light.png | Bin 6848 -> 6743 bytes .../sprites/combat/blade_strike_light.xcf.bz2 | Bin 14336 -> 14817 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/data/sprites/combat/blade_strike_light.png b/data/sprites/combat/blade_strike_light.png index da3f815ecb4719895892285f228c9af18acc4d80..db1b1cab50588515c23960c4d40f5bfc45c0ae32 100644 GIT binary patch delta 6239 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 JPDHLkV1jt2B!K_` delta 6389 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 literal 14336 zcmYMa1yCG37cPt}zPMAMEV}sO-tOYExKn5scXw$Ei&LPuLvfeIy=8HCcP*}kLhbGC zcW3_lKa)(7$w{7^GnvRq*2%Q1%HxnPu`#8?UH{P4vG*@(OBm)vp+i}wZOa@tG87b*YMy;cf2n$>uTox7 z3|W|6)Rfbv)IDRc!fgE~J^F8;|C;^7KcfF7qW?0HtRPCYIBm`)5za+NS*L91l(r73 zDskn%%76H$*#GqV|A1K-8U=4Y1aW?Fgpd1g!krUBQgb>IY}60{c5|ONbpdz2>r`Mr zP!VUgw&(}o@EzXzujln&$}MW~vy>u4fRh7^42+}*5?r!U1ly)!wjOxriVjs))+ z)h1p3y!a|C{QZw`0)~^pC=02vzz@CA*2wqI-Li7?eb{QFU<=RBR?Sn*2zlr-f(6-_ z{r&^_e=X+CNQZwfd4BRRv-_N}TYW&aI!o;>$%lorr~M}}4W4zHpWOuqXNiiA+l0kG zdJmDrJjx?RNY~y1H{2pJLX~FwymL=~5-}L19=WJ*IV`3Q>COk67Fu~W+Y(v<*5_gJ z+xT4FF_<8V<-m?9#>uH0{)&Ax8-A##mQydC`_VjZ(|IWjQSl_6q{3{QA(s#SdI5_=lX zIbij{*4@NB!=cw={ae!&5k2jk{&s>JKi1CIM8rS~iuWgt?6U1}9!V#4dVpy^_sT@R zUISvAxW>EOR(kmGX@J_oT=Gu;@K1ILWW&8Yyqa($(HZfs}NL%>#MTDEX174Gf;3( z`X;v@L)mT0(MUJweG$pYAzs$pLr3dZ_fN`pBp6B=S>6y?mQW}M3J_l4Buo`XT;TE& zVsgH+a97k%B-Md^j9rL;VL<`R7zi?Rlp`d%-ip$a4L0vU$r9PjsIz4MilC1f`vbI= z9sd;}>E6Mp*xa8z%d(JFGHJ}8f^WY#2i|Rb7|7NnRX%8Ym@F^2EZz3CKk}(knp^6X zqaIxpt(obKGTg;Y5Ys7P&9<69XlNqm+A?NZ{V&be8%I5MGjDqK<{hz=K&=GTrz4&J zGVx8yT6xcQ?W>$BB;3Xu8QXgS54*2EV2${4?ua`HxEGU#PsxcBx+LzL#b201y2 zUoswa0uuT%{@b25GeIVGj}0ELjh8UToE};uI4>=n2@?z-GoA03w2d$M2RSLwPht49%pl|f<5e)cr z?0Z?0q{bg9QCZL9PCJ+YKmZwO2s1-p$JtL^;gR`%<`czuhx$&?j16z10j-RZVO!$;n?93N=yA+ z`fM>Qj82t{*vZP|p?!VXVX1fljFj!HpJX6jWK4T_^I62~FWvFUAFyyTB4>egGG8BH zpYg={aU$#0E-go82?_%Q$t3yV75#Zt`VzfUY0M4Pn{_5ZIYX5-7Cf+De%GWTOS7*@ ziI7e=)V}rRF;=Yjdk8c+K*88A-uc%g;6Rf*suj>bi>8PnWx8GY>JRXu756n ztrKWD*kEVsSsPX)=h&Y|rfqW(TOPm|dZVQa@pg|cfNrm?l955t7%%`C=V4zM5(_VY zis0hsM+*<8se&5Jn7#-cyb+SVU0C7h3*Wt4Ir_yJW2{!Jvfb-iXHIJM^1V||3S|Faq=SAE3Kzre(jhQkx<@WH`C>vYdy7ac{ zP1B{%21i~j344=yNA>dh%f8nhxZE0;9Gh9(n~Zy5+j-kMUUf^Zruy6&Eo0;3{_@{W zR+YEsIy>C30**!UvXjZ^uOyEROpG#q4!73_WU$BFm5;>-6 z!CNY`slf%m!dwHZ`@JS@#%;-_>3zSuRr8rzb}ga_i1}F=b3&=n*vl%@c*3;32+8yz z>3qa*^eP==pB@7?i!IS!B}DM&++(xozMKXpvWmXoc=+UR!DyNwA5lfTgkkN(D0xIH zqe9h(szvUEe9<|cvooFKu&*oGujzC@|1OHw>NFS%{)KI>i8(Db>hOJF`+{^x6M6~I zwWt1q>**bX!&~Dur-vJ2_LjHbfBIhhj>(wC2lx~d|5Q5J(GgA3;Om*^=(5_%ReyT) z3ThJCxwh3kA1#e{yD((F?_DKIFZAEh&h)k)cD;OYT$F!TO7cWt(_z#6U@%!==r>DP z+lHHj&K9q)OO=f;?tT?Nv+$Chat>v(lyrzKka%C&agc3NlzatCnY9$4@2doIxSi;r zE(aY7QDE@|?r4IGu3$aXC*L%du^}{5_t1C=Hi4r^(OCBC!fqSY4VZsa;L*7!Z8v1; z$9najgZRUoMJVx%%Li-fsqUs7A6Q zv5`FNmNpnE1kCUKfdWK9#f4Rky)@#~4w=nuTeM&|>UcZ+B918W)s1qMtlJ11SC;PX z7G$;$bh(@dTv-jS-X1S1s$9Qjwi^CMhnb}-^jcDsr3%xUOqx!7b&GYielie*7rBQg zv~8M!&zB_69hap{);Q<7jzLt3+^h+Dx7jCWt7a)ze{DPK8d<~*mbxqyrGPvvC*ZJh zIlveQ#fkDm(u%T?%e?WZ@JvB0SS`%bLdpBnC{c(hw^DjSoj&( zi{M_ug}Mp?)j=@yPMcTcMZ=`oYz7PFiRC7qqT9*N?e96cl5UH(E9>CS*_%9g*Gtl! z@x3P}5r639E?iLVv&+rTX~}>W*Mjr|J=c+bTA17K-g}FP`wK>1$Xly?DJERVrv&F; zL>>*->Jf7;13iPk*zekQehra#Coi`DP0#p(BzfPX-kMSJn_h3zeC;vUL(RIsK)ZS&tpWJr}&T{AN!@oZ%vgf|gmgT#+;bcqDeU-S* zC?1KZD!`#b({~ddyy(5Hy=?T7>Qn(O z@;FLWSww2uN8~f5r1vvJxl25Xm%+q3(Eu}#odJKP6+Tg2gOv$Y7TB#U9sNt7JZI?M zoZL}o-CE~6jk^l?P;{c;+(6)l5Ewf(4ZM-anCLIviLujPGSRn8Z9+4_EzC^?GRtCl z9s6hM`;x2Id{<3FtlxB9tKYljIz}Eo2I}46{B4VX)0&d;@s@!}m_#|%$k zb8GpvYMu7{FQKI5L%c^fiNLP`_nKa8lx#{g9O6gb4XYvDng7-n)8bp72{*lphi}&| zL#@sVRok0!=qUfa8S3cMf<-Sxn#o33@)yuY-=qT#zE`AE$_bp=dg62^GoM}DHpFq> z(u?e&6Z3GHa&OFd)=LFWbXQtV8!ba_$Lf}plvOUz_OiCKvQiZ?5>9)Bzhb!8RSR`cGZs|t&xZ29*u@;(xaHknxV`Ui2D-MKUi+tF9d zEy)@8m|RTIzGmu0veB*$wdpu{wIiy{o0~;c!U8y$rb23+z*z;+(#vt`F4{1^*s;la z{2jkR4qGg3c10@csT#3YC>1vyzd+uPd|74uTPZxhCkTfC+HuZLH>24}gTO{Bb?+Dt0W>7C62g{h;Ext+aZ{;>02QGAez$dSo4qyZ%YnPSV6t23`_Hfud5epYvX)!31!S2nteZy*KH}Kc)`!Q>?QYyaVA`v z>+Z$0Nu?%DG^;rHV$0-rZmRPHjcm^rG)rwx zo^4vg>u>7`{bbh$k`;4%pEJF-I{Ofps4lI3FL#>ie?8!<$mqO~Y(B%dLEAf3=2mT( zcCzMrRZr-$_&vuSQ2QgCHP*t&IHN*OkoC%<#)j3P&MB;Kd`g40FTEqpwP4-L*3;aG zMr^ytmw)Spv9Z;@8THoM!^#e+>r_PKC0=UP#vO%w{^rOX7Z@y?5J;dHljp+L~^5Ar(4NLo5AT}^+1#MfM=@x%6#jc zPcnF+G)Ox|EQ9gQ4?btAEqbk`pNON@<`#jlZ%6XK;4MLyhbyQVs|KglyQ z8G2Rs$Je7hcxy1PAX2vDhr28N9iUy3nz>)G*V?u!k-Cu%7UnV}27=mR8=>bse@&qK zJW|-76z+xs*k7;tIIS5}_ArDCXUJuq6H%1B6f+Uo#;eJG*su`j>xruXylNCU(Wj^t z^o*F0QS3A)0fO`+ZQ~uT>Y2O-`}V?QJfu5rNxq-kuBfBJYPn zXUt)iCLJzR=%oxp9{Oz=Jd~a%oVUGxdH`32Qi`&SU9@tiD}WQ5zWs?f@%v5hiK+Bbe_*$fAL5Y(k1w4}r(=GE$j@CQL( z8>s9Vkf`sv)YD7b*?mfH7kCkTg1zI}%|Yt)P2KIs&AFz91%(Dz9A|#7f7`c8 zoc-S>XWlouqU`&*okqobKw^5@l2i0B&5~hUV&(`w;5!ml283CPeqchfGgs{HN27w&j`!CUkZKO`iq~~e~`AMrs)JaiqWS6 zs7zQ9?4n&$jU^gnRFejOR+V4vwgFv2{I+h4rkjN|t8;+I5E;z!Xky2yY@TeoD5M8H ze?qM$oV<8dRGcx&0+&gwmWEg>EDK^Vg;VD=>o82*TxA)D47Ubp#0n{ACvXlY)zbNS zCJ5Vx+pwe5IPC~Eq;oM{=tb$cR|&>&F{1L>Cn+WKDZ?ShT4Lb}30CW%`6<_8vYEpl;`{ni$= z(531=QO!7FVki^wEEEg|fjQ>w4eF41?q1y3$>TEtg3D4O4nVQf-a?Wh&6&cfxK_54 zN1P^>>E+RRz}wIQJ5eTe1q^xio7KYNN=%d2ctq%ZO*%9L4)9Bv_E_sfJL_|XOSYjd z=?6K9jLOlJ5$LK703~AbB4SKhfxZb5g|tIdTTn6JbG1P>$WBKG2!flrFP7rh(nN7- zA@1tTr41ErT0!`h! z=b)rRIBIZm3ZfvICX9wG5C8`#MPQV`F&s>692`CoRmB!Gfq^g;U;v_r29!1{Kn;kY zqpE1pGE8>iNCSW27mrtT-(P)^&9hQ}7Ngzv2LH!<0&OPgZxjjKC6h{oOy(_r#776y z&BMxo28#nf+L1&jM?Xw_{84F~X{E2f2XgU9ae<^(NLU%yS$r0dWE)EA22YGpPo1eB z%GEQ*t(oq81C=%d2bCeSkoamv zhlJcn7$Lcq{0Tv|P0i3T`|O}74go};T}&08)&hZ2D+ueQVMBGoj$VlT{yR~q)t4Pt zZf54dp21+0R#rxe-Gd(G=2qyY#K^)$mdo36DrJ{OAZ@bL@WCuBQ8|t*g&7WocAQaB z^bTsACNpqUf}g;N3g;1uM1lj;*{d=$;1`Tz<) zd}RVve0KbAtBlOJwck!|{j*oY#Y#qc)~IuCrYC!EA(Xrz5F}#jKFTh`hCWFRi7-lb z;KabP#6^;9u<;SdmqMCFD>-nmnlWKeI1mD_U9^$HTQ8*z>%JOPV1$!%@Cn19zfa^{ zBCf+@wCI?Uq}WIGAp>wes(uZwfBrOn0{sKj?QKJGTP+hw=fO84_ua>*hcE2q{qmM} zxaACF+4@z$NfenppudHZua8&+O9vduIshC~!Sv!%5Vyld9FQr_UkLMNN5scd%aJS8 zj`3?iCSU*&0GG%~Dn^z7NzRJi$y1wUk93a+w!8>D9Dp^6Oa+jMfZ;DxU+ys#p5o!t zzKfrq9O$*19MHLn0?Yl?5vE7VX8H~g2m>ek`NrU*A?&I3(Ey~3a;YeKeaQ@84wF-i z)TZnWz9*$#m_0XZfy#jADLqR{=qJ%>J7m}{IhYj-iG+zPqAwi?Br`*sF@QocLfGuB0J4GxX-zdC6)dpVLFSa$ef0ZU&IE}~%r3ed{#3;jk0N zq=}x`*KbUVyK1R-A0W50JgizKl)HMej3O6O(XA$3F{ z^gE)lkiv=`+#W&B5bd1fx+PnrUc|e+Aob59CJq+SG=MKg1N6FuH`|=5%%*ZCboceJlOb}7QR4A4TEdIun=cP%lHA5Nxrd=vCh zIE`YQ>I1$ijD32~GX@cwhSc`o2{w~PPiag5DWPy;09hZ5U6cUoBI#pqIiNs+W_~l` z-Hh_l7~lW_CJBW2#-L%@;UEruTSNpKe?KoSaZ$2HNJ`4KZP(86yu(O>%xr_W6PfPh+77Pxee=Ug#tS1RBW;AOH~K z2q!7(i%maEf`)6dG#y2?_g>*9FK=?MtHNX|8KK#%DFocys;opmeh$rTOv%M+V(8)d zDS88H$zY-|01h@8Ics!rt}ygekb*%wkNDW%zP>bEtj>mWmD|xYts0Zl$P_mUUwC`c zPXud0Q?DXZq6ga%1fvR7RU3tcXGgnb0LZJ#STfH|nB}6{JLNk_v|x`N4^B&Db$~?D zPa;LHD@tU1P%g&hFvo%NKF5XM)x1JN_b3Hkj=ymOG<+s*mMF@%Bdy`Ly&XX!bT9J9 z=H7l-Q@p+o@ox3>``z$eoZjkn_t&2wq^%{2P&!4p(@sStLvy=`Iq-TQd@d&4Wh*U`z=uG8GE+lFJf%JrA`-~NW*mr(mA zlIYm@9E9G|8)Z!2YCnDX6Og)2pdDoN2=OKTb)DH~l?KycCvy;1^+A0#3Uy#mi_@~! znWX}x^Ju4{%Kl9X07bka#u!mB5W~?yodMUkFozIJl~73vEDd8v;9_JTscEpgZUH~1 zRAIc~k3AuQ?*%ycGLF&VBdl_4Z-;3xUWBtF;<$2zy6=8t`6>TO?!B`<-Ru9g(y&N2 z^2_}-?Ms{8a=8CyNM-i&`ZuVQ8=Jwqcw>Xce&D8gi3Czw`gMi;B z#e3EZE#8dm#XNgV9&!0y);@+R98x|P;h9P#%#?w96n2t#zfCH4YH|zrKr9RfGkp=o`sw-WUI`h`*wz$Em!(8Hpy+kmtCY~dPP^rPB|{|kK)GvPS#%6yFm_- zj@7^6pNYJk@|foOvGc~hmSrG6KjK7%#>OJigCne+%-b1>4(%_t2-G)qq%y$Ltm4q* zFw}+1$Q~;U)wDgW!5Nw`vG%Jk=J%BKI0fo{0z6LO&!ze6NrA5ISZjTGx+7_@fv8T` z7&eV&6_Y*T7sykAE@o1$tR7F;YrK!ka=(B6$d+ifa$=Q>c|PsEUhKA(uB3y8T5O-i zlyhrUB_w%woaM4NsR#Oc(Hw{E&i9Oi7}t{H`6rTc$!s%ZoW^VTxK}T{IofqNn#wIq z4&vQ(#uS6S>k=6^iW6E56x}*Ua^ZJuNmrHr+?@)BESJe``eDYt0>t9xjmqK%mveq- zbU(dr+nE$&hnZ`9>szg96_Gqck2at6^d%|=j?CW( zr*OfE_qJC^b_8O4!@qKPoEtF-U45j#a9s43YR6*9sSd$aDD%G1vR2yO3=;k^M4XMC z-A(Mt61S(qgYu>L7&IaIIqtIK=g%VJ`MaNM?KpEwFdwVTCXeq%DC8i7PLAZo%Pvt- zmyam}_NYn)V4Jw)=E-+tU39jY8KVg0N7J>cW~enS+slNF(I*hXQYgsgj3Qq?QRv4T zR$if1BhdNdpShbq`8xsH*{Lp6`bq+8a_@+Rq=nr1qa%cfea%M|gK@?JobhaRXXm{M zjecGI)sun_r+@ZkTX?leuIa9$N2!Ub_DW?E>MpE#gQ;3Bn|yAl+(fZ8=h9uR;2N8# zEV%~4JqXubAd_%Wv~*Q|g}GH7Q4LbaBo=TN!&K}2YFj7XUgD{B>^Hy%kIz+&IF(9Z z71Hn-&?92*{^qzoXU=Z*mTCLZ-=+lXn}WZla`f7)@2H}cmo)!XRJzhZgU5BWH?=gBS2ZF_A4!#i6(u98n0RJS9IYC;6LRLfi?hWMNcjm-^K zh4oo`4GFW@{a7)v9UuApatNGJkloz{mrf6g&u?Fy=X}j@Mo2g(v48V9KkdWjkWV$Y zuFrJ3NNpvV&uMY4a9fyIW3y1ePxx>!5vP%{E~90~Ju<%hxH3;EE*e>cJlRbqTTn1} zuki7(XG^u%{&u~C90T!?$M`1?k0`S2Cy@lYsAb^AcY{+v|MJg_4FI zru20G#+bqW?s;>=$JCU*-_G9jyu;o^Nq1VqX6sq&Vl|*<*90je>*Cy6 zzD%#Y>IB1asV-5W!@wYu1I?nul5qp#mTlTy2CrX#njUtRQ6IURY)6-xH0tgw;U<^s z0}&<9=F%QmxqBuUn-mO<_6H}`8+7_#+cs9kCse28SyOp&8w~pk6v*GM)doh|PH?@d zRU+4CfA*AGSCN?oD45hxd~wOpfVh2(`N9`HU!b+fpafQ)|T4?0f$5n$HM_JpY^NnpBrSj(DtI{_7s@1bT*FT&eE>sDZsxLO!>PG z^^M(DBsUKg4HUf@z+a`>fy&?#EuO@VO-X;ZdRpB$F(eAP+zcQeJvl#BBU2Q@OIrRd z7aHUoaM?Kj^X0E#>oeK*AO&)e-Q<`^mq`gH$dwgU76GJ8O$l!%uu6WZ`$b@e77I zvTvvdCPgJa|7z~sOdEgr^W8ikkgdF`s;+H?Ug>JtDru2W$@B*D9<+0p$DGz7e9{Vw*&PWPRHI_zC_N;| zSBzS7+M`Ty_eSMY#iA;L#_Px|T);)u5?)Y!>sz*zkNmA~jJ543n_$w>S$GnEypUyRpb4n6_>Z?OYnw~YlY@htpV(3KM3b_OHG@QT4VO4Epe#SmqRo$z z&H#T5{{gjy30-h4JrdUWCCNSRcRI;mzXGQvLt) z>d#9^QDfsKTd(9s{o?thEU)f&-L8SCi{^1I?L`oNk`-s#Dos7n=i{3?S>DWS31C{Y}iP~%ih-qg)l ze>41a_eF4Zw_qbS7B#7Xmr+d*(f=WR_U;Qxc`#WRpDmF^(z|yS-AL@3+KqwsM#yY181?Qy`|N z#fP%zJ(cRaqije5ZQzCEGaz8Ba1nH+R+o9i9!%{S!B~h13Dx>bp1l>r`#kYVNu~`$ z&ZbO{om@DQ@oai31WraK>g$NZZC)q}BA2miam+DzXHfVV&&6Q(pnycO)IzVIjJylQoxOeW^tf|X*aB~UEG*7v zDB;l1C4yaiBrqU5gzp7~i*?>XUruJyorQ0=6LC2@oB%(eBad;fj$u2(7p0kVzt{2V zz{-u7R-xUbn;}6-|8#fH;4+CCsi=+vAjU6>GAOd5QVpZQCnpnHL$1}aH7!SIS;N7y?uU5q1xej6@hqhc zfYek3LtLQZlK3ldJGc4zu&@kM}T)hpcmLep7sv4!5 zhysTu5uih)GhdW~aV%33uBYZ8ObwAY6_K8#Dml2hgSwW%XVOKbHKy4}&(Kz{WApW+e|Aa9bg(DLZ)T%}Ho|7-A8YwiTO z7{$bJM_Y411|UPGZo|uUffj4}-v&!RCE2oo|LsC}Xf0pzX5b}9*B9>T*U}`ZLVJxv zIhPUv37dRvHbS2EU}w(DOdE7eJnsW`l;D=*Y#Qu|%ONmjSrd?u17d(H=O5SdchMBs4&z zfj8H74+FK^kFMw%tQw`HAb{yG9Oh|_Qqg??I`L*>Ao>zSVXq3~>Z}oP`gVjJicT75 zK#o}<8s6>cK|zlm#*SIP!lT;tVZy`qEX=#a&&Wc&)FHyw8nOh_;UOgFOHH7mOt7GG z0Z?4JqH@-Y!b5T$NNbmpjymo$6AxS*A}j!6`6o$Xm?iWEABhX(=D|&?CPv0-f!m2- zflgUD{M14Cif}7R9;v5pSHw52>d?+j)GIQF ziwUy|DvhEN{v=l+qE8f#>GNIiligaVj|^5uILyq141(lIf?Ccp@3x_R@-PON0t-+` zh*!Al20#M{kQiueBo>ekiy{mOV_`vOfEIO23Ca^;lUzgu9R^rAA8e*#=5^G=;5ZJD z#Sikuzrs$9x1NMP;FTnBk$>?{-G4o6XTmj+HVn4Q%tXlV8|#3rD=QD!I$$(IvhCXX z0zam^NAsLWZjav`7dsaC>|Tc)?b?3?ItEzpw%1-KNK!-eJ)LB~@7r82=thOB^O)&t z;mGsz>{j#h>f_dfqtaVqI!@gh)XF}j9M%YsyOEVHh)MFsEsygV6qTjqpw@JhObT## zdD7x05AaC+x9)q|`@#oGcIp>47qVQ3`%3rM^jf)K6BT)c2oBRPUCSU ziZj(s^&Qy_sC6?0+%D!URA~BNo0XRIPZappM$^F&Kfb)kC@7s%VPtjN)z^u{u%b3P Wd*w>;>hFh6);zE((HB~4jQ<1cVO Date: Thu, 29 Apr 2010 23:56:02 +0000 Subject: [PATCH 14/15] backported fix by madmetzger: make damage types more understandable by using percentlike notation --- src/games/stendhal/server/entity/item/Item.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/games/stendhal/server/entity/item/Item.java b/src/games/stendhal/server/entity/item/Item.java index 0242e15a0e..420b466875 100644 --- a/src/games/stendhal/server/entity/item/Item.java +++ b/src/games/stendhal/server/entity/item/Item.java @@ -574,7 +574,8 @@ public class Item extends PassiveEntity implements TurnListener, EquipListener { stats.append(" "); stats.append(entry.getKey()); stats.append(": "); - stats.append(entry.getValue()); + stats.append(Math.round(100/entry.getValue())); + stats.append("%"); } } String statString = ""; From eb809b11f7749bf6572609e418c0aa66924fde67 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Mon, 3 May 2010 18:35:49 +0000 Subject: [PATCH 15/15] fixed spamming of portal reject message by clearing the path (fixes #2996056) --- .../server/entity/mapstuff/portal/AccessCheckingPortal.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/games/stendhal/server/entity/mapstuff/portal/AccessCheckingPortal.java b/src/games/stendhal/server/entity/mapstuff/portal/AccessCheckingPortal.java index ca70b69440..e384f7acb1 100644 --- a/src/games/stendhal/server/entity/mapstuff/portal/AccessCheckingPortal.java +++ b/src/games/stendhal/server/entity/mapstuff/portal/AccessCheckingPortal.java @@ -55,6 +55,8 @@ abstract class AccessCheckingPortal extends Portal { protected void rejected(final RPEntity user) { if (rejectMessage != null) { sendMessage(user, rejectMessage); + user.stop(); + user.clearPath(); } }