yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addressed some exploitable hunter and herblore issues

Browse Source 
Temporarily disabled puro puro, grenwalls pending fixes
This commit is contained in:
Ceikry
2023-03-29 23:19:38 +00:00
committed by Ryan
parent 9f85619334
commit 91ec97220b
5 changed files with 126 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/data/configs/drop_tables.json
+105 -1
View File
@@ -27896,7 +27896,7 @@
"maxAmount": "1"
}
],
"ids": "1832,5750",
"ids": "5750",
"description": "",
"main": [
{
@@ -60099,5 +60099,109 @@
"maxAmount": "1"
}
]
},
{
"default": [],
"charm": [],
"ids": "1832",
"description": "Cave Bug (Level 6)",
"main": [
{
"minAmount": "8",
"weight": "5.0",
"id": "555",
"maxAmount": "8"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "561",
"maxAmount": "1"
},
{
"minAmount": "6",
"weight": "2.0",
"id": "557",
"maxAmount": "6"
},
{
"minAmount": "1",
"weight": "1.0",
"id": "561",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "23.0",
"id": "14424",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "2.0",
"id": "235",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "2.0",
"id": "221",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "2.0",
"id": "223",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "1.0",
"id": "225",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "1.0",
"id": "231",
"maxAmount": "1"
},
{
"minAmount": "3",
"weight": "8.0",
"id": "995",
"maxAmount": "3"
},
{
"minAmount": "1",
"weight": "64.0",
"id": "0",
"maxAmount": "1"
},
{
"minAmount": "8",
"weight": "3.0",
"id": "995",
"maxAmount": "8"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "36",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "3.0",
"id": "590",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "1.0",
"id": "4527",
"maxAmount": "1"
}
]
}
]
Server/src/main/content/global/skill/hunter/BoxTrapNode.java
+1 -1
View File
@@ -8,7 +8,7 @@ import core.game.node.item.Item;
* Handles the box trap node.
* @author Vexia
*/
public final class BoxTrapNode extends TrapNode {
public class BoxTrapNode extends TrapNode {
/**
* The summoning level required.
Server/src/main/content/global/skill/hunter/Traps.java
+8 -1
View File
@@ -42,7 +42,14 @@ public enum Traps {
new BoxTrapNode(new int[] { 5080 }, 63, 265, new Item[] { new Item(10034, 1) }, 1),
new BoxTrapNode(new int[] { 7012, 7014 }, 66, 400, new Item[] { new Item(12535) }, 1),
new BoxTrapNode(new int[] { 8654 }, 73, 315, new Item[] { new Item(14861) }, 1),
new BoxTrapNode(new int[] { 7010, 7011 }, 77, 726, new Item[] { new Item(12539, 1) }, 1)),
new BoxTrapNode(new int[] { 7010, 7011 }, 77, 0, new Item[] { new Item(12539, 1) }, 1) {
@Override
public boolean canCatch(TrapWrapper wrapper, final NPC npc) {
//old xp: 726
wrapper.getPlayer().sendMessage("Note: Giving 0 xp for grenwalls until this area and its requirements are implemented.");
return super.canCatch(wrapper, npc);
}
}),
RABBIT_SNARE(new TrapSetting(10031, new int[] { 19333 }, new int[] {}, "lay", -1, Animation.create(5208), Animation.create(9726), 27)),
IMP_BOX(new MagicBoxSetting(),
new TrapNode(new int[] { 708, 709, 1531 }, 71, 450, new int[] { -1, 19226 }, new Item[] { new Item(10027) })),
Server/src/main/content/global/skill/hunter/bnet/BNetPulse.java
+10 -12
View File
@@ -73,18 +73,16 @@ public final class BNetPulse extends SkillPulse<NPC> {
player.sendMessage("You need a Hunter level of at least " + type.getLevel() + " in order to do that.");
return false;
}
if (!type.isBareHand(player)) {
if (type.hasWeapon(player)) {
player.getPacketDispatch().sendMessage("Your hands need to be free.");
return false;
} else if (!type.hasNet(player)) {
player.sendMessage("You need to be wielding a butterfly net to catch " + (type instanceof ImplingNode ? "implings" : "butterflies") + ".");
return false;
} else if (!type.hasJar(player)) {
player.getPacketDispatch().sendMessage("You need to have a" + (StringUtils.isPlusN(type.getJar().getName()) ? "n" : "") + " " + type.getJar().getName().toLowerCase() + ".");
return false;
}
}
if (type.hasWeapon(player)) {
player.getPacketDispatch().sendMessage("Your hands need to be free.");
return false;
} else if (!type.hasNet(player)) {
player.sendMessage("You need to be wielding a butterfly net to catch " + (type instanceof ImplingNode ? "implings" : "butterflies") + ".");
return false;
} else if (!type.hasJar(player)) {
player.getPacketDispatch().sendMessage("You need to have a" + (StringUtils.isPlusN(type.getJar().getName()) ? "n" : "") + " " + type.getJar().getName().toLowerCase() + ".");
return false;
}
if (node.isInvisible() || DeathTask.isDead(node)) {
return false;
}
Server/src/main/content/minigame/puropuro/PuroPuroPlugin.java
+2 -1
View File
@@ -263,7 +263,8 @@ public final class PuroPuroPlugin extends MapZone implements Plugin<Object> {
player.getDialogueInterpreter().sendDialogue("Something prevents you from entering. You think the portal is offended by", "your imp boxes. They are not popular on imp and impling planes.");
break;
}
player.getTeleporter().send(Location.create(2591, 4320, 0), TeleportType.PURO_PURO);
player.sendMessage("Puro Puro is disabled until its rewrite/bugfix update is complete.");
//player.getTeleporter().send(Location.create(2591, 4320, 0), TeleportType.PURO_PURO);
return true;
case 11273:
if (!player.getZoneMonitor().isInZone("puro puro")) {