From ebd55e6e8dad1eeb0a982bfb750b37ceab0306b3 Mon Sep 17 00:00:00 2001 From: Peter Farber Date: Tue, 29 Sep 2020 11:57:10 -0400 Subject: [PATCH] Mining Fixes | Yell Command Fix (#420) * Fixed Yell Command * Added Mining Sounds. Fixed Addy and Mith Pickages. --- .../java/com/rebotted/game/content/skills/core/Mining.java | 6 ++++-- .../main/java/com/rebotted/net/packets/impl/Commands.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/core/Mining.java b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/core/Mining.java index fa25ed95..f250c7b3 100644 --- a/2006Redone Server/src/main/java/com/rebotted/game/content/skills/core/Mining.java +++ b/2006Redone Server/src/main/java/com/rebotted/game/content/skills/core/Mining.java @@ -37,8 +37,8 @@ public class Mining { {1265, 1, 1, 625}, //Bronze {1267, 1, 2, 626}, //Iron {1269, 6, 3, 627}, //Steel - {1271, 31, 5, 629}, //Addy - {1273, 21, 4, 628}, //Mithril + {1273, 21, 4, 629}, //Mithril + {1271, 31, 5, 628}, //Addy {1275, 41, 6, 624}, //Rune }; @@ -158,6 +158,7 @@ public class Mining { public void execute(CycleEventContainer container) { if (c.isMining) { c.startAnimation(Pick_Settings[c.miningAxe][3]); + c.getPacketSender().sendSound(432, 100, 0); } else { container.stop(); } @@ -202,6 +203,7 @@ public class Mining { } player.startAnimation(Pick_Settings[player.miningAxe][3]); + player.getPacketSender().sendSound(432, 100, 0); player.isMining = true; repeatAnimation(player); player.rockX = objectX; diff --git a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java index 87c03f30..275f0a0a 100644 --- a/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java +++ b/2006Redone Server/src/main/java/com/rebotted/net/packets/impl/Commands.java @@ -54,7 +54,7 @@ public class Commands implements PacketType { if (player.playerRights <= 1) { delay = 30000; } - if (!AntiSpam.blockedWords(player, playerCommand.substring(5), true)) { + if (!AntiSpam.blockedWords(player, arguments[0].substring(5), true)) { return; } if (Connection.isMuted(player)) {