Merge pull request #269 from CSS-Lletya/master

Few fixes
This commit is contained in:
Daniel Ginovker 2020-03-29 11:16:53 -04:00 committed by GitHub
commit b739673807
4 changed files with 39 additions and 2 deletions

View file

@ -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 + ')');

View file

@ -130,7 +130,7 @@ public final class FireMakingPulse extends SkillPulse<Item> {
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 =

View file

@ -0,0 +1,36 @@
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;
@InitializablePlugin
public class GoblinVillagePopulationPlugin extends OptionHandler {
@Override
public Plugin<Object> 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 = 2;
final List<NPC> 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;
}
}

View file

@ -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;
}
}