From c98d1739b5385217d97963c434cc9e3cf7d72bd8 Mon Sep 17 00:00:00 2001 From: qahowers <61567064+qahowers@users.noreply.github.com> Date: Fri, 28 Feb 2020 22:00:45 -0500 Subject: [PATCH 1/8] Update Client.java --- Client/src/org/runite/Client.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/src/org/runite/Client.java b/Client/src/org/runite/Client.java index 1e7689885..78f42e3d1 100644 --- a/Client/src/org/runite/Client.java +++ b/Client/src/org/runite/Client.java @@ -15,7 +15,7 @@ NOTICE: THIS IS THE LIVESERVER CLIENT. For development purposes, use GameLaunch. */ public class Client { - public static final String PUBLIC_IP_ADDRESS = "198.52.151.60"; + public static final String PUBLIC_IP_ADDRESS = "192.168.1.144"; /** * The game settings. From ca550976c2e9ed630ac14d46da5a5397b4503cc1 Mon Sep 17 00:00:00 2001 From: Purplecow-dev <61662796+Purplecow-dev@users.noreply.github.com> Date: Sun, 1 Mar 2020 13:11:29 -0500 Subject: [PATCH 2/8] Fixed magic tutors typos --- Server/src/plugin/dialogue/MagicTutorDialogue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/src/plugin/dialogue/MagicTutorDialogue.java b/Server/src/plugin/dialogue/MagicTutorDialogue.java index a9cc96612..35702e2d0 100644 --- a/Server/src/plugin/dialogue/MagicTutorDialogue.java +++ b/Server/src/plugin/dialogue/MagicTutorDialogue.java @@ -151,7 +151,7 @@ public final class MagicTutorDialogue extends DialoguePlugin { stage = 12; break; case 12: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Nemarti, the Ranged Combat tutor and I both give out", "items every 30 minutes, however you must choose", "wether you want runes or ranged equipment. To", "claim runes, right-click on me and choose Claim, to claim"); + interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Nemarti, the Ranged Combat tutor and I both give out", "items every 30 minutes, however you must choose", "whether you want runes or ranged equipment. To", "claim runes, right-click on me and choose Claim, to claim"); stage = 13; break; case 13: @@ -159,7 +159,7 @@ public final class MagicTutorDialogue extends DialoguePlugin { stage = 14; break; case 14: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "When you have the sepll available, click on it once, then", "click on your target. A good target would be a monster", "that is below your combat level."); + interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "When you have the spell available, click on it once, then", "click on your target. A good target would be a monster", "that is below your combat level."); stage = 15; break; case 15: From 52eff0ca452cde1eb73e36f7b0fa8faf91ec7023 Mon Sep 17 00:00:00 2001 From: b-7-7 <61488301+b-7-7@users.noreply.github.com> Date: Sun, 1 Mar 2020 21:59:31 -0600 Subject: [PATCH 3/8] Fixed guard pickpocketing Guards now give 30 coins every time they are pickpocketed, not sure where that 25 would have come from --- .../game/content/skill/member/thieving/Pickpocket.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/src/org/crandor/game/content/skill/member/thieving/Pickpocket.java b/Server/src/org/crandor/game/content/skill/member/thieving/Pickpocket.java index c0e517139..367d6b7de 100644 --- a/Server/src/org/crandor/game/content/skill/member/thieving/Pickpocket.java +++ b/Server/src/org/crandor/game/content/skill/member/thieving/Pickpocket.java @@ -23,7 +23,7 @@ public enum Pickpocket { ROGUE(new int[] { 187, 2267, 2268, 2269, 8122 }, 32, new int[][] { { 995, 25 }, { 995, 40 }, { 1993, 1 }, { 556, 2 }, { 1219, 1 }, { 1523, 1 }, { 1944 } }, 35.5, 2), CAVE_GOBLIN(new int[] { 5752, 5753, 5754, 5755, 5756, 5757, 5758, 5759, 5760, 5761, 5762, 5763, 5764, 5765, 5766, 5767, 5768 }, 36, new int[][] { { 995, 30, 1 }, { 590, 1 }, { 4522, 1 }, { 4544, 1 }, { 596, 1 }, { 1939, 1 }, { 441, 4, 1 }, { 441, 1 }, { 10981, 1 } }, 40, 2), MASTER_FARMER(new int[] { 2234, 2235 }, 38, new int[][] { { 5096, 1 }, { 5097, 1 }, { 5098, 1 }, { 5099, 1 }, { 5100, 1 }, { 5101, 1 }, { 5102, 1 }, { 5103, 1 }, { 5104, 1 }, { 5105, 1 }, { 5106, 1 }, { 5291, 1 }, { 5292, 1 }, { 5293, 1 }, { 5294, 1 }, { 5295, 1 }, { 5296, 1 }, { 5297, 1 }, { 5298, 1 }, { 5299, 1 }, { 5300, 1 }, { 5301, 1 }, { 5302, 1 }, { 5304, 1 }, { 5305, 1 }, { 5306, 1 }, { 5307, 1 }, { 5308, 1 }, { 5309, 1 }, { 5310, 1 }, { 5311, 1 }, { 5312, 1 }, { 5318, 1 }, { 5319, 1 }, { 5320, 1 }, { 5321, 1 }, { 5322, 1 }, { 5323, 1 }, { 5324, 1 }, { 5296, 1 }, { 5297, 1 }, { 5298, 1 }, { 5299, 1 }, { 5300, 1 }, { 5301, 1 }, { 5302, 1 }, { 5303, 1 }, { 5304, 1 } }, 43, 3, "You attempt to pick the " + "@name" + "'s pocket...", "You pick the " + "@name" + "'s pocket.", "You fail to pick the " + "@name" + "'s pocket.", "Cor blimey mate, what are ye doing in me pockets?"), - GUARD(new int[] { 9, 32, 206, 296, 297, 298, 299, 344, 345, 346, 368, 678, 812, 9, 32, 296, 297, 298, 299, 2699, 2700, 2701, 2702, 2703, 3228, 3229, 3230, 3231, 3232, 3233, 3241, 3407, 3408, 4307, 4308, 4309, 4310, 4311, 5919, 5920, }, 40, new int[][] { { 995, 30 }, { 995, 25 } }, 46.5, 2), + GUARD(new int[] { 9, 32, 206, 296, 297, 298, 299, 344, 345, 346, 368, 678, 812, 9, 32, 296, 297, 298, 299, 2699, 2700, 2701, 2702, 2703, 3228, 3229, 3230, 3231, 3232, 3233, 3241, 3407, 3408, 4307, 4308, 4309, 4310, 4311, 5919, 5920, }, 40, new int[][] { { 995, 30 } }, 46.5, 2), FREMENIK_CITIZEN(new int[] { 2462 }, 45, new int[][] { { 995, 40 } }, 65, 2), BEARDED_BANDIT(new int[] { 1880, 1881, 6174 }, 45, new int[][] { { 995, 40 } }, 65, 5), DESERT_BANDIT(new int[] { 1926, 1921 }, 53, new int[][] { { 995, 30 }, { 995, 30 } }, 79.5, 3), @@ -199,4 +199,4 @@ public enum Pickpocket { public int getStunDamage() { return stunDamage; } -} \ No newline at end of file +} From d68c50d983a71d2017d82bac6a7785a20b69e1f4 Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Tue, 3 Mar 2020 12:06:02 +1300 Subject: [PATCH 4/8] Update online players when a server starts up (fix flags) --- .../system/mysql/WorldListSQLHandler.class | Bin 3392 -> 3519 bytes .../system/mysql/WorldListSQLHandler.java | 6 +++++- .../game/node/entity/player/Player.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CompiledServer/production/RS-2009/org/keldagrim/system/mysql/WorldListSQLHandler.class b/CompiledServer/production/RS-2009/org/keldagrim/system/mysql/WorldListSQLHandler.class index 5c18b89fae72bfb95bd6e2bad8c0a967a34ab063..f1265d22c150a3bf667c88e0b1c8f6d60ad5b57a 100644 GIT binary patch delta 1334 zcmZvb+gDU|6vscmGY5W$!(pjoMMBXetu+b)MnGDEkc?pgDwl|`i{w-omjKJkYEsMY z*V9EzyU@k#Vj?zZwakZlsHa}~7kq22ddZiH_MSoGp*8F5+izdLd(WAo?~7AE|MSgh zpoWu{K94OPw_EP;ak}UYq)LpD`oh7AI!=EU(K@;a(?U!s(x! z0@GDTqk(`ocr)NF-nN7R`h1N7RIUZhiD)Y7B0CMJygr&nJeG z@DF=Yc-jq8hqd6RTK@>2Sw0W=LX|H$8t@ep1}DBe;22W@$F;&VCoEqFq}AbOwajqT zP}RMuxky2`(lS;mU0=_iF8Ru zFXejHhz6xHX@f-Mv6jY6WHPVLtPT(6m8R4`Mnvvup+Y8F0hV<%i{GVUO|V{UH_B&m zdMqujJZz9O4y(jiE}twBGbO}9yU`AzGSf+reVps$Cb4VyBKZU_O%XQuKcqA&Dlf>D zP0GASWa8s8@qe>S&t;gD*lcgwQ7O(WyD*kk97~&}eOAmFJ(AT8^NVgg-?#ZLGcuej zn<3ntUy<_K%1*H43`J>{9U#Y9Q+$XjF)jWUw|9n|=<+mH^g?0LG9hX5PqDzEz2X!L z4L$RH%d@^0tM3XS#cBL#g$SaEY@?M~`SLU+`c#!J&%9kRfprh#M%1`6>l0J?YLPD# z50?c?tzy=|f^c)NBvmbAt(EOH2{sAY+;*X(va_?a@S7~_PXR%(tRY9@baZCBN-q!V~sRZ-kW&jWwK_`l%GUsx*W i(Nqf88*xuka7_68yJ??yH||`24m}yKTj|a4+x`XZPuqO} delta 1197 zcmZvb*>hA?5XOJ!=8osg%}GHfr7;Owqw_ElNHk;t6pT?OtO*(d2r7uODXWPZ!6j}4 z6@hu+#BSB@eT!lHKgF?2V{q zUlzlD$0KS79D`~fbv&l_am$cadqV53JD~2th$neUy{C0~#xbnrcIpMs>Q&Ea;`5cf zz>AT1hctD>aoF*a<7LMyjw6nvj#nM8SzaIiYs8qn@#Y|JH(K5hM)62cGRG$V2&znf zJDmnRZxVan;%&<@&pV7N@~-DS#ysu3Z~4H}&ssxnNoiH7zm)IpTiuf%+BdL!>!4Ki ze8@+Zk3Gj3jhn*y+E3{8+(wtdF7I7a>g&&YPS6@}3K!4#lvYDnoSQFt7V%kpDlC*f z*PFi3i@)S6%Sq2E4Nh~$^EIP}pg7y}4c~gsYUy##StdN^^}q^6zT-^1EVJF1iPM>F z71y8vxQ+jpQl3J!AxZ>X=+|M*%E=DGRYuH7VS7$k{>Nov zs=^7$E%&A!6$mEfu^G!s0?R5(&!oUT++hC;Dc1ZxnnW{FTm>9tKH=@7zQB1a-p{3K%h zCSvGd8q*qaFeNFRiyH@kf{y-rp`>V7MadUV~1EXeQsq? qu>YN%{CT9hYThhXB@Vx*>a5u5vagsXyE4)T7_cr~*K>DjH(Ummg0;#3 diff --git a/Management-Server/src/org/keldagrim/system/mysql/WorldListSQLHandler.java b/Management-Server/src/org/keldagrim/system/mysql/WorldListSQLHandler.java index 2440c1251..6557c655b 100644 --- a/Management-Server/src/org/keldagrim/system/mysql/WorldListSQLHandler.java +++ b/Management-Server/src/org/keldagrim/system/mysql/WorldListSQLHandler.java @@ -60,10 +60,14 @@ public final class WorldListSQLHandler extends SQLEntryHandler { return; } int players = entry.getPlayerAmount(); + WorldInfo info = entry.getInfo(); if (!entry.isActive()) { players = -1; } - WorldInfo info = entry.getInfo(); + if (players <= 0) { + PreparedStatement statement = connection.prepareStatement("UPDATE members SET online='0' WHERE lastWorld='" + value + "'"); + statement.executeUpdate(); + } PreparedStatement statement = connection.prepareStatement("UPDATE " + table + " SET players='" + players + "', ip='" + info.getAddress() + "', country='" + info.getCountry().getId() + "', member='" + (info.isMembers() ? 1 : 0) + "', revision='" + info.getRevision() + "' WHERE world='" + value + "'"); statement.executeUpdate(); SQLManager.close(statement.getConnection()); diff --git a/Server/src/org/crandor/game/node/entity/player/Player.java b/Server/src/org/crandor/game/node/entity/player/Player.java index db5f91106..05ae4f19c 100644 --- a/Server/src/org/crandor/game/node/entity/player/Player.java +++ b/Server/src/org/crandor/game/node/entity/player/Player.java @@ -550,7 +550,7 @@ public class Player extends Entity { inventory.addAll(c[0]); if (gravestone) { graveManager.create(ticks, items); - sendMessages("Because of your current gavestone, you have "+graveManager.getType().getDecay()+" minutes to get your items and", "equipment back after dying in combat."); + sendMessages("Because of your current gravestone, you have "+graveManager.getType().getDecay()+" minutes to get your items and", "equipment back after dying in combat."); } familiarManager.dismiss(); From 050225cc243202065a9dc4b5b95d48f9e45edf02 Mon Sep 17 00:00:00 2001 From: qahowers Date: Wed, 4 Mar 2020 19:58:12 -0500 Subject: [PATCH 5/8] Adds attack bonus to cup of tea Adds ability to remove-legs on swamp toads --- .../plugin/consumable/CupofTeaPlugin.class | Bin 1666 -> 2155 bytes RS-2009.iml | 2 + .../src/plugin/consumable/CupofTeaPlugin.java | 16 +++++++- .../skill/herblore/SwampToadPlugin.java | 36 ++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 Server/src/plugin/skill/herblore/SwampToadPlugin.java diff --git a/CompiledServer/production/RS-2009/plugin/consumable/CupofTeaPlugin.class b/CompiledServer/production/RS-2009/plugin/consumable/CupofTeaPlugin.class index 87060dc60d0c2db6b51d3ebcdda85a219e17fe1c..cab20e2ce1a5661f865df1b580c59ac3b50b9b87 100644 GIT binary patch delta 838 zcmZ`%&u8MM};hfllhE<^H8)vd`f ztGoK3(@EEbofCJ(wOoU7)?#q}Q{cW}ZOg1bY2IJ0H6JfETb;HB%iUsSHs@xfj{kyz zd0b>DxuZ(SG%$us!dzxZ2*}~RkOqRV7$)}e>58r^?v_*yR}3uRs(~tM1{QJ6Kp2sC z3v!gHJYJcvxXa3t>1(d6csnrMj=Re&>3&l}?p@h8v=_0MxZ%E0?m2!^2c)GW7*I5V z5Qe~Tz{~1TC?+7XQFmI6_J%1hvd;nj4jmjkmzz{(Jaq_(cq1f~}9?dNuGRbVyl@KdKUP#Psr;or}igtA1m=zjY|Lp!pb%*leUnQwD O9gNi@is_`^d-Yyb*Xz$jFV=YbdUyuVz>$p-$`&d%Bvx$L@GVp$sM%P>ny%Mv z7^qv===VB8#pIQ`ku9;QUgULj%b~=!Kudjy8C5e%wgV44`r1|Rp_9a(gMA!0I7HKd zi}?L<*c0l~I8_<*qG(Va5XfQz4r7d!go!Y74)ac^Thr?%iEDqr40~Cmm`w+@i8Llz zfvhQFg2zKfGl{i{3dXdbl&_DF9V2Ny4G|h5+$StC7S2<&5D04{q>O|GpX_EwdS?jn z0B$X14q%=8wdxR&v6LHhOR!MpE|owo_rv(}>0%ah!4od#u>hH9bJs + + diff --git a/Server/src/plugin/consumable/CupofTeaPlugin.java b/Server/src/plugin/consumable/CupofTeaPlugin.java index 845a70680..6532529ca 100644 --- a/Server/src/plugin/consumable/CupofTeaPlugin.java +++ b/Server/src/plugin/consumable/CupofTeaPlugin.java @@ -3,6 +3,8 @@ package plugin.consumable; import org.crandor.game.content.global.consumable.ConsumableProperties; import org.crandor.game.content.global.consumable.Consumables; import org.crandor.game.content.global.consumable.Drink; +import org.crandor.game.content.skill.SkillBonus; +import org.crandor.game.content.skill.Skills; import org.crandor.game.node.entity.player.Player; import org.crandor.plugin.InitializablePlugin; import org.crandor.game.node.item.Item; @@ -15,6 +17,11 @@ import org.crandor.game.node.item.Item; @InitializablePlugin public final class CupofTeaPlugin extends Drink { + /** + * Represents the skill bonuses for each beer. + */ + private SkillBonus[] bonuses; + /** * Represents the force chat to use. */ @@ -30,12 +37,19 @@ public final class CupofTeaPlugin extends Drink { * Constructs a new {@code CupofTeaPlugin} {@code Object}. */ public CupofTeaPlugin() { - super(712, new ConsumableProperties(2, 1980)); + super(712, new ConsumableProperties(3, 1980)); + this.bonuses = new SkillBonus[1]; + this.bonuses[0] = new SkillBonus(Skills.ATTACK, 0, 3); } @Override public void consume(final Item item, final Player player) { player.sendChat(CHAT); + if (this.bonuses != null) { + for (SkillBonus b : bonuses) { + addBonus(player, b); + } + } super.remove(player, item); } diff --git a/Server/src/plugin/skill/herblore/SwampToadPlugin.java b/Server/src/plugin/skill/herblore/SwampToadPlugin.java new file mode 100644 index 000000000..56c9443e9 --- /dev/null +++ b/Server/src/plugin/skill/herblore/SwampToadPlugin.java @@ -0,0 +1,36 @@ +package plugin.skill.herblore; + + +import org.crandor.cache.def.impl.ItemDefinition; +import org.crandor.game.interaction.OptionHandler; +import org.crandor.game.node.Node; +import org.crandor.game.node.entity.player.Player; +import org.crandor.game.node.item.Item; +import org.crandor.plugin.InitializablePlugin; +import org.crandor.plugin.Plugin; + +/** + * Represents the swamp toad plugin. + * @author Zombiemode + * @version 1.0 + */ +@InitializablePlugin +public final class SwampToadPlugin extends OptionHandler { + @Override + public Plugin newInstance(Object arg) throws Throwable { + ItemDefinition.setOptionHandler("remove-legs", this); + return this; + } + + @Override + public boolean handle(Player player, Node node, String option) { + if (player.getInventory().replace(new Item(2152), ((Item) node).getSlot()) != null) { + player.getPacketDispatch().sendMessage("You pull the legs off the toad. Poor toad. At least they'll grow back."); + } + return true; + } + + @Override + public boolean isWalk() { return false; } +} + From 9449291aec7dfd1815b4395f83a50d2c4f1193b5 Mon Sep 17 00:00:00 2001 From: qahowers Date: Wed, 4 Mar 2020 20:12:31 -0500 Subject: [PATCH 6/8] Revert change --- RS-2009.iml | 2 -- 1 file changed, 2 deletions(-) diff --git a/RS-2009.iml b/RS-2009.iml index 64fc99ef9..2154a37dc 100644 --- a/RS-2009.iml +++ b/RS-2009.iml @@ -7,9 +7,7 @@ - - From 853ed225ef3baf1e97d985de8644f571e09221fd Mon Sep 17 00:00:00 2001 From: qahowers <61567064+qahowers@users.noreply.github.com> Date: Wed, 4 Mar 2020 20:18:41 -0500 Subject: [PATCH 7/8] Revert debug changes Should not have been committed --- Client/src/org/runite/Client.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Client/src/org/runite/Client.java b/Client/src/org/runite/Client.java index 78f42e3d1..1e7689885 100644 --- a/Client/src/org/runite/Client.java +++ b/Client/src/org/runite/Client.java @@ -15,7 +15,7 @@ NOTICE: THIS IS THE LIVESERVER CLIENT. For development purposes, use GameLaunch. */ public class Client { - public static final String PUBLIC_IP_ADDRESS = "192.168.1.144"; + public static final String PUBLIC_IP_ADDRESS = "198.52.151.60"; /** * The game settings. From bbe92aa96fa7754b88e7f1b2e3b215c5811bf627 Mon Sep 17 00:00:00 2001 From: qahowers <61567064+qahowers@users.noreply.github.com> Date: Wed, 4 Mar 2020 20:23:40 -0500 Subject: [PATCH 8/8] Fix copy paste commentary flaw Tea is not beer. --- Server/src/plugin/consumable/CupofTeaPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/src/plugin/consumable/CupofTeaPlugin.java b/Server/src/plugin/consumable/CupofTeaPlugin.java index 6532529ca..237f0a9c0 100644 --- a/Server/src/plugin/consumable/CupofTeaPlugin.java +++ b/Server/src/plugin/consumable/CupofTeaPlugin.java @@ -18,7 +18,7 @@ import org.crandor.game.node.item.Item; public final class CupofTeaPlugin extends Drink { /** - * Represents the skill bonuses for each beer. + * Represents the skill bonuses. */ private SkillBonus[] bonuses;