2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-10 10:20:41 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fishing Guild & Edgeville Fixes

Browse source
This commit is contained in:
downthecrop 2022-01-11 06:25:42 +00:00 • committed by Ryan
parent fb4296debd
commit 8f4a003db8
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -99,3 +99,6 @@
- Emerald and diamond bracelet enchants no longer produce noted items - Emerald and diamond bracelet enchants no longer produce noted items
- Prevent furnace temperature from going negative and deduplicate bar handling. - Prevent furnace temperature from going negative and deduplicate bar handling.
- Fix player saves for players who used coal on the conveyer belt before bf-fixes. - Fix player saves for players who used coal on the conveyer belt before bf-fixes.
- Fix Edgeville canoe -> wilderness pond.
- Fix Edgeville Dungeon Wilderness gate getting stuck.
- Fishing guild is able to be entered with a fishing skill boost.

5
Server/src/main/java/core/game/content/activity/guild/FishingGuild.java
View file

@ -30,12 +30,11 @@ public final class FishingGuild extends OptionHandler {
@Override @Override
public boolean handle(Player player, Node node, String option) { public boolean handle(Player player, Node node, String option) {
final int id = ((Scenery) node).getId();
switch (option) { switch (option) {
case "open": case "open":
switch (id) { switch (node.getId()) {
case 2025: case 2025:
if (player.getSkills().getStaticLevel(Skills.FISHING) < 68 && player.getLocation().withinDistance(new Location(2611, 3394, 0))) { if (player.getSkills().getDynamicLevels()[Skills.FISHING] < 68 && player.getLocation().withinDistance(new Location(2611, 3394, 0))) {
player.getDialogueInterpreter().sendDialogues(308, null, "Hello, I'm afraid only the top fishers are allowed to use", "our premier fishing facilities."); player.getDialogueInterpreter().sendDialogues(308, null, "Hello, I'm afraid only the top fishers are allowed to use", "our premier fishing facilities.");
return true; return true;
} }

13
Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java
View file

@ -45,8 +45,7 @@ public final class EdgevilleNodePlugin extends OptionHandler {
@Override @Override
public boolean handle(Player player, Node node, String option) { public boolean handle(Player player, Node node, String option) {
int id = ((Scenery) node).getId(); switch (node.getId()) {
switch (id) {
case 9262: case 9262:
case 9261: case 9261:
case 30806: case 30806:
@ -82,14 +81,14 @@ public final class EdgevilleNodePlugin extends OptionHandler {
case 29319: case 29319:
case 29320: // Edgeville Dungeon wilderness entrance case 29320: // Edgeville Dungeon wilderness entrance
if (option.equalsIgnoreCase("open") && player.getLocation().getY() < 9918) { if (option.equalsIgnoreCase("open") && player.getLocation().getY() < 9918) {
Location endLocation = new Location(player.getLocation().getX(),player.getLocation().getY()+1); player.getInterfaceManager().openComponent(382);
player.getInterfaceManager().open(new Component(382));
player.setAttribute("wildy_gate", node); player.setAttribute("wildy_gate", node);
player.setAttribute("wildy_gate_loc",endLocation); player.setAttribute("wildy_gate_loc",
Location.create(player.getLocation().getX(),player.getLocation().getY()+1));
} }
else{ // Leaving the wilderness else{ // Leaving the wilderness
Location endLocation = new Location(player.getLocation().getX(),player.getLocation().getY()-1); DoorActionHandler.handleAutowalkDoor(player, (Scenery) node,
DoorActionHandler.handleAutowalkDoor(player, (Scenery) node,endLocation); Location.create(player.getLocation().getX(),player.getLocation().getY()-1));
} }
} }
return true; return true;

2
Server/src/main/kotlin/rs09/game/interaction/object/canoestation/CanoeInterfaceListeners.kt
View file

@ -118,8 +118,8 @@ class CanoeInterfaceListeners : InterfaceListener() {
PacketRepository.send(MinimapState::class.java, MinimapStateContext(player, 2)) PacketRepository.send(MinimapState::class.java, MinimapStateContext(player, 2))
player.interfaceManager.hideTabs(0, 1, 2, 3, 4, 5, 6, 11, 12) player.interfaceManager.hideTabs(0, 1, 2, 3, 4, 5, 6, 11, 12)
} }
travelAnimDur -> player.properties.teleportLocation = dest
travelAnimDur+1 -> { travelAnimDur+1 -> {
player.properties.teleportLocation = dest
player.interfaceManager.close(Component(Components.CANOE_TRAVEL_758)) player.interfaceManager.close(Component(Components.CANOE_TRAVEL_758))
player.interfaceManager.closeOverlay() player.interfaceManager.closeOverlay()
player.interfaceManager.openOverlay(Component(Components.FADE_FROM_BLACK_170)) player.interfaceManager.openOverlay(Component(Components.FADE_FROM_BLACK_170))