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

Massive refactor of several different components including networking fixes

Browse Source
This commit is contained in:
Ceikry
2021-12-19 05:40:17 +00:00
parent ecaed745ef
commit 10219652b0
506 changed files with 2116 additions and 5072 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/rs09/game/ai/lumbridge/LumbridgeBotHandler.java
+2 -2
View File
@@ -1,6 +1,6 @@
package rs09.game.ai.lumbridge;
import rs09.game.world.GameWorld;
import rs09.game.world.World;
import core.tools.RandomFunction;
import java.util.concurrent.Executors;
@@ -13,7 +13,7 @@ public class LumbridgeBotHandler {
public static void immersiveLumbridge()
{
//Generate a few random bots here and there
System.out.println("[" + GameWorld.getSettings().getName() + "]: LumbridgeBotHandler: Initialized dead idlers.");
System.out.println("[" + World.getSettings().getName() + "]: LumbridgeBotHandler: Initialized dead idlers.");
generateDeadIdlers();
}
Server/src/main/java/rs09/game/ai/pvp/PVPAIPActions.java
+3 -3
View File
@@ -12,7 +12,7 @@ import core.game.node.entity.player.Player;
import rs09.game.ai.AIPlayer;
import core.game.node.item.Item;
import core.game.system.task.Pulse;
import rs09.game.world.GameWorld;
import rs09.game.world.World;
import core.game.world.map.path.Pathfinder;
import core.game.world.update.flag.context.ChatMessage;
import core.game.world.update.flag.player.ChatFlag;
@@ -56,7 +56,7 @@ public class PVPAIPActions {
};
bot.getProperties().setRetaliating(true);
bot.setAttribute("dead", false);
GameWorld.getPulser().submit(new Pulse(1, bot) {
World.getPulser().submit(new Pulse(1, bot) {
int ticks;
@Override
public boolean pulse() {
@@ -131,7 +131,7 @@ public class PVPAIPActions {
bot.sendChat("Ahh!");
bot.sendChat("GTFO M8");
bot.sendChat("Someone spec him!");
GameWorld.getPulser().submit(new Pulse(1, bot) {
World.getPulser().submit(new Pulse(1, bot) {
int ticks;
@Override
public boolean pulse() {
Server/src/main/java/rs09/game/ai/resource/ResourceAIPActions.java
+2 -2
View File
@@ -4,7 +4,7 @@ import core.game.node.entity.skill.gather.SkillingResource;
import core.game.node.entity.player.Player;
import rs09.game.ai.AIPlayer;
import core.game.system.task.Pulse;
import rs09.game.world.GameWorld;
import rs09.game.world.World;
import rs09.game.world.repository.Repository;
import java.util.List;
@@ -21,7 +21,7 @@ public class ResourceAIPActions {
}
for (int aip_index = 0; aip_index < resource_players.size(); aip_index++) {
final AIPlayer bot = resource_players.get(aip_index);
GameWorld.getPulser().submit(new Pulse(1, bot) {
World.getPulser().submit(new Pulse(1, bot) {
int ticks;
int ov;
@Override
Server/src/main/java/rs09/game/ai/resource/ResourceAIPManager.java
+4 -4
View File
@@ -4,7 +4,7 @@ import core.game.node.entity.player.Player;
import rs09.game.ai.resource.task.ResourceTask;
import rs09.game.ai.resource.task.ResourceTasks;
import core.game.system.task.Pulse;
import rs09.game.world.GameWorld;
import rs09.game.world.World;
import java.sql.ResultSet;
import java.sql.Statement;
@@ -58,7 +58,7 @@ public class ResourceAIPManager {
public ResourceAIPManager load(Player player) {
try {
Statement statement = GameWorld.getDatabaseManager().connections().get("global").createStatement();
Statement statement = World.getDatabaseManager().connections().get("global").createStatement();
ResultSet result = statement.executeQuery("SELECT * FROM `members` WHERE username='" + player.getUsername() + "'");
// Results result = new Results(GameWorld.getDatabaseManager().query("global", "SELECT * FROM `members` WHERE username='" + player.getUsername() + "'"));
@@ -87,14 +87,14 @@ public class ResourceAIPManager {
StringBuilder query = new StringBuilder();
query.append("UPDATE `members` SET `taskName`='" + entry.getKey().getTaskName() + "',`taskTime`='" + entry.getValue() + "' WHERE `username`='" + player.getUsername() + "'");
System.out.println("ResourceAIPManager: " + query.toString());
GameWorld.getDatabaseManager().update("global", query.toString());
World.getDatabaseManager().update("global", query.toString());
}
return this;
}
public void pulse(Player player) {
GameWorld.getPulser().submit(new Pulse(1) {
World.getPulser().submit(new Pulse(1) {
@Override
public boolean pulse() {