Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge pull request #32 from dginovker/remake-changes

Browse source 
Couple of remake changes - do not merge yet
This commit is contained in:
Daniel Ginovker 2019-11-07 19:27:18 -05:00 • committed by GitHub
commit 3e8d244987
4 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -35,7 +35,7 @@ Since this portion of the guide is operating-system specific, you will either ne
- Import `Server/server.sql` and `Server/global.sql` into their respective databases
- _Refer [here](https://www.thecodedeveloper.com/import-large-sql-files-xampp/) for help importing the `.sql` files_
# Linux Command Line
### Linux Command Line
- Instructions for various Linux distros can be found [here](https://github.com/dginovker/RS-2009/tree/master/CompiledServer/Guides)

10
Server/src/org/crandor/game/node/entity/player/ai/resource/ResourceAIPManager.java
View file

@ -1,8 +1,11 @@
package org.crandor.game.node.entity.player.ai.resource;
import org.crandor.game.node.entity.player.Player;
import org.crandor.game.node.entity.player.ai.AIPBuilder;
import org.crandor.game.node.entity.player.ai.pvmbots.PvMBotsBuilder;
import org.crandor.game.node.entity.player.ai.resource.task.ResourceTask;
import org.crandor.game.node.entity.player.ai.resource.task.ResourceTasks;
import org.crandor.game.node.entity.player.ai.skillingbot.SkillingBotsBuilder;
import org.crandor.game.system.task.Pulse;
import org.crandor.game.world.GameWorld;
@ -32,6 +35,13 @@ public class ResourceAIPManager {
return this;
}
public void immerseWorld() { //There's probably a better place for this (it adds bot at bootup)
PvMBotsBuilder.immersiveSpawns();
AIPBuilder.immersiveSpawns();
SkillingBotsBuilder.immersiveSpawnsSkillingBots();
System.out.println("Loaded immerseWorld");
}
public ResourceAIPManager runTask(Player player, String taskName) {
for (Map.Entry<ResourceTask, Long> entry : getTasks().entrySet()) {
if (entry.getKey().getTaskName().equalsIgnoreCase(taskName)) {

18
Server/src/org/crandor/game/world/GameWorld.java
View file

@ -125,21 +125,6 @@ public final class GameWorld {
pulses.clear();
ticks++;
for (Player p : Repository.getPlayers()) {
if (p.isPlaying()) {
switch (RandomFunction.getRandom(1000)) {
case 1:
p.sendMessage("<col=BA55D3>Tip: You can earn some extra gold by looting the stalls in Ardougne.");
break;
case 2:
p.sendMessage("<col=BA55D3>Tip: You can begin slayer by speaking to Turael at home.");
break;
case 3:
p.sendMessage("<col=BA55D3>Tip: Speak to Bill Reach to get to popular areas.");
break;
}
}
}
if (ticks % 50 == 0) {
TaskExecutor.execute(() -> {
try {
@ -201,10 +186,11 @@ public final class GameWorld {
ScriptManager.load();
PluginManager.init();
ResourceAIPManager.get().init();
ResourceAIPManager.get().immerseWorld();
SQLManager.postPlugin();
parseObjects();
CallbackHub.call();
// ResourceAIPManager.get().init();
if (run) {
SystemManager.flag(GameWorld.getSettings().isDevMode() ? SystemState.PRIVATE : SystemState.ACTIVE);
}

7
Server/src/plugin/command/AIPCommandPlugin.java
View file

@ -13,6 +13,7 @@ import org.crandor.game.node.entity.player.ai.pvmbots.PvMBotsBuilder;
import org.crandor.game.node.entity.player.ai.pvp.PVPAIPActions;
import org.crandor.game.node.entity.player.ai.pvp.PVPAIPBuilderUtils;
import org.crandor.game.node.entity.player.ai.resource.ResourceAIPActions;
import org.crandor.game.node.entity.player.ai.resource.ResourceAIPManager;
import org.crandor.game.node.entity.player.ai.skillingbot.SkillingBotsBuilder;
import org.crandor.game.node.entity.player.ai.wilderness.PvPBotsBuilder;
import org.crandor.game.node.entity.player.link.appearance.Gender;
@ -214,10 +215,10 @@ public final class AIPCommandPlugin extends CommandPlugin {
case "noobbot":
PvMBotsBuilder.spawnNoob(player.getLocation());
return true;
case "immerse":
case "immersiveworld":
case "immersive":
PvMBotsBuilder.immersiveSpawns();
AIPBuilder.immersiveSpawns();
SkillingBotsBuilder.immersiveSpawnsSkillingBots();
ResourceAIPManager.get().immerseWorld();
return true;
case "fishtest":
SkillingBotsBuilder.spawnTroutLumbridge("Bot", new Location(3241, 3242));