From 0806bcb285ec7ada59774aeb6bdb13f8d7420515 Mon Sep 17 00:00:00 2001 From: CSS-Lletya Date: Sat, 28 Mar 2020 23:30:30 -0400 Subject: [PATCH 1/4] Force Tweening enabled --- Client/src/org/runite/jagex/GameShell.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Client/src/org/runite/jagex/GameShell.java b/Client/src/org/runite/jagex/GameShell.java index 5e546f145..2e1bef974 100644 --- a/Client/src/org/runite/jagex/GameShell.java +++ b/Client/src/org/runite/jagex/GameShell.java @@ -213,6 +213,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Class3_Sub13_Sub6.aBoolean3078 = true; Class3_Sub28_Sub5.aBoolean3593 = false; AnimationDefinition.aLong1847 = Class5.method830((byte)-55); + Class3_Sub26.aBoolean2558 = true; } } catch (RuntimeException var4) { throw Class44.method1067(var4, "rc.BA(" + var1 + ')'); From 380c4aa09b94d4d6cc76e0c6bf31b4591d27012e Mon Sep 17 00:00:00 2001 From: CSS-Lletya Date: Sat, 28 Mar 2020 23:41:41 -0400 Subject: [PATCH 2/4] Fixed Varrock Hard Diary task --- .../game/content/skill/free/firemaking/FireMakingPulse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/src/org/crandor/game/content/skill/free/firemaking/FireMakingPulse.java b/Server/src/org/crandor/game/content/skill/free/firemaking/FireMakingPulse.java index 98bb0eee0..8e0f5c55f 100644 --- a/Server/src/org/crandor/game/content/skill/free/firemaking/FireMakingPulse.java +++ b/Server/src/org/crandor/game/content/skill/free/firemaking/FireMakingPulse.java @@ -130,7 +130,7 @@ public final class FireMakingPulse extends SkillPulse { if (!groundItem.isActive()) { return; } - if (fire == Log.YEW && !player.getAchievementDiaryManager().getDiary(DiaryType.VARROCK).isComplete(2, 2) && player.getLocation().withinDistance(new Location(3256, 3487, 2))) { + if (fire == Log.YEW && !player.getAchievementDiaryManager().getDiary(DiaryType.VARROCK).isComplete(2, 2) && player.getLocation().withinDistance(new Location(3256, 3487, 3))) { player.getAchievementDiaryManager().getDiary(DiaryType.VARROCK).updateTask(player, 2, 2, true); } // GameObject originalOnSpot = From f0cde9d264b1509ef3c8eb8caac4819c5ff88e00 Mon Sep 17 00:00:00 2001 From: CSS-Lletya Date: Sat, 28 Mar 2020 23:55:44 -0400 Subject: [PATCH 3/4] Goblin Village SIgn Post Soft fix --- .../object/GoblinVillagePopulationPlugin.java | 26 +++++++++++++++++++ .../object/ReadSignPostPlugin.java | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 Server/src/plugin/interaction/object/GoblinVillagePopulationPlugin.java diff --git a/Server/src/plugin/interaction/object/GoblinVillagePopulationPlugin.java b/Server/src/plugin/interaction/object/GoblinVillagePopulationPlugin.java new file mode 100644 index 000000000..1227e09b2 --- /dev/null +++ b/Server/src/plugin/interaction/object/GoblinVillagePopulationPlugin.java @@ -0,0 +1,26 @@ +package plugin.interaction.object; + +import org.crandor.cache.def.impl.ObjectDefinition; +import org.crandor.game.interaction.OptionHandler; +import org.crandor.game.node.Node; +import org.crandor.game.node.entity.player.Player; +import org.crandor.plugin.InitializablePlugin; +import org.crandor.plugin.Plugin; + +@InitializablePlugin +public class GoblinVillagePopulationPlugin extends OptionHandler { + + @Override + public Plugin newInstance(Object arg) throws Throwable { + ObjectDefinition.forId(31301).getConfigurations().put("option:read", this); + return this; + } + + @Override + public boolean handle(Player player, Node node, String option) { + int population = 26; //TODO: Find out how to get all goblins in the area. + player.getDialogueInterpreter().sendPlainMessage(false, "Welcome to Goblin Village.", "Current population: " + population); + return true; + } + +} diff --git a/Server/src/plugin/interaction/object/ReadSignPostPlugin.java b/Server/src/plugin/interaction/object/ReadSignPostPlugin.java index f6ffc5ed1..2ea0be403 100644 --- a/Server/src/plugin/interaction/object/ReadSignPostPlugin.java +++ b/Server/src/plugin/interaction/object/ReadSignPostPlugin.java @@ -108,7 +108,7 @@ public class ReadSignPostPlugin extends OptionHandler { ObjectDefinition.forId(31298).getConfigurations().put("option:read", this); ObjectDefinition.forId(31299).getConfigurations().put("option:read", this); ObjectDefinition.forId(31300).getConfigurations().put("option:read", this); - ObjectDefinition.forId(31301).getConfigurations().put("option:read", this); +// ObjectDefinition.forId(31301).getConfigurations().put("option:read", this);//goblin village return this; } } From ad9b6ec1b954c8dbf4df9ecd8babe7b1a7d50b1d Mon Sep 17 00:00:00 2001 From: CSS-Lletya Date: Sun, 29 Mar 2020 00:19:34 -0400 Subject: [PATCH 4/4] Update GoblinVillagePopulationPlugin.java --- .../object/GoblinVillagePopulationPlugin.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Server/src/plugin/interaction/object/GoblinVillagePopulationPlugin.java b/Server/src/plugin/interaction/object/GoblinVillagePopulationPlugin.java index 1227e09b2..76dc4751b 100644 --- a/Server/src/plugin/interaction/object/GoblinVillagePopulationPlugin.java +++ b/Server/src/plugin/interaction/object/GoblinVillagePopulationPlugin.java @@ -1,9 +1,13 @@ package plugin.interaction.object; +import java.util.List; + import org.crandor.cache.def.impl.ObjectDefinition; import org.crandor.game.interaction.OptionHandler; import org.crandor.game.node.Node; +import org.crandor.game.node.entity.npc.NPC; import org.crandor.game.node.entity.player.Player; +import org.crandor.game.world.map.RegionManager; import org.crandor.plugin.InitializablePlugin; import org.crandor.plugin.Plugin; @@ -18,8 +22,14 @@ public class GoblinVillagePopulationPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - int population = 26; //TODO: Find out how to get all goblins in the area. - player.getDialogueInterpreter().sendPlainMessage(false, "Welcome to Goblin Village.", "Current population: " + population); + int population = 2; + final List npcs = RegionManager.getLocalNpcs(player); + for (NPC n : npcs) { + if (n.getName().equals("Goblin")) { + population++; + player.getDialogueInterpreter().sendPlainMessage(false, "Welcome to Goblin Village.", "Current population: " + population); + } + } return true; }