From c204bd4b7c6d31084c8ea856b7e7d84b8e74f33f Mon Sep 17 00:00:00 2001
From: Daniel Ginovker <dcress01@uoguelph.ca>
Date: Fri, 8 Nov 2019 16:15:53 -0500
Subject: [PATCH] Remake changes (#41)

* Bot fixes & improvements

* Accurate bot combat stats generation

* Fix AIP crash

* 1x exp rate and debug off
---
 Server/data/botdata/namesandarmor.txt         |   1 -
 Server/data/eco/grand_exchange_db.emp         | Bin 138082 -> 138082 bytes
 Server/server1.properties                     |   2 +-
 Server/src/org/crandor/Server.java            |   2 +-
 .../crandor/game/content/skill/Skills.java    |   4 +++-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Server/data/botdata/namesandarmor.txt b/Server/data/botdata/namesandarmor.txt
index 6818f710d..e9945743d 100644
--- a/Server/data/botdata/namesandarmor.txt
+++ b/Server/data/botdata/namesandarmor.txt
@@ -107,7 +107,6 @@ Leviathan Sr:3:0:1007:0:13328:6654:0:0:6655:0:0:0:0:
 Chuka Ryori:102:0:0:0:1387:0:0:0:0:0:0:0:0:
 5g4sg4sg4sg:3:0:0:0:0:0:0:0:0:0:0:0:0:
 Elroyfct19:8:1949:0:0:0:0:1173:0:0:0:0:0:0:
-Cattles:57:21720:0:22692:20779:13284:24325:0:13285:0:13287:13286:0:
 PureEffectQ:37:1161:1019:1725:1331:1123:1540:0:1073:0:1059:1061:0:
 rowcharger2:58:2613:0:0:1387:2607:2611:0:3475:0:1065:0:0:
 Redrani1:33:1038:0:0:0:0:0:0:0:0:0:0:0:
diff --git a/Server/data/eco/grand_exchange_db.emp b/Server/data/eco/grand_exchange_db.emp
index 5a21fe783a458ddb0b5ffb81a6fb86e6c9775734..162477603efb566c10d60ee300e4a04f571bd202 100644
GIT binary patch
delta 25
hcmaE~jpNZa4h{we#ynr^@An%yS~(cEaxg_n0|0!R2w?yK

delta 25
gcmaE~jpNZa4h{we#ym038=j3EtsIP7IhdlP0dFY>LjV8(

diff --git a/Server/server1.properties b/Server/server1.properties
index f88bcdb88..18f7446f4 100644
--- a/Server/server1.properties
+++ b/Server/server1.properties
@@ -1,5 +1,5 @@
 name=2009scape
-beta=true
+beta=false
 sql=true
 devMode=false
 gui=true
diff --git a/Server/src/org/crandor/Server.java b/Server/src/org/crandor/Server.java
index ee52d19dd..25c31fc7b 100644
--- a/Server/src/org/crandor/Server.java
+++ b/Server/src/org/crandor/Server.java
@@ -82,7 +82,7 @@ public final class Server {
 	}
 
 	/**
-	 * Sets the bastartTime.
+	 * Sets the bastartTime.ZZ
 	 * @param startTime the startTime to set.
 	 */
 	public static void setStartTime(long startTime) {
diff --git a/Server/src/org/crandor/game/content/skill/Skills.java b/Server/src/org/crandor/game/content/skill/Skills.java
index 355921e31..7f6017d17 100644
--- a/Server/src/org/crandor/game/content/skill/Skills.java
+++ b/Server/src/org/crandor/game/content/skill/Skills.java
@@ -259,6 +259,7 @@ public final class Skills {
 	 * @return The experience mod.
 	 */
 	private double getExperienceMod(int slot, double experience, boolean playerMod, boolean multiplyer) {
+		//This function returns 1.0;
 		if (!(entity instanceof Player)) {
 			return 1.0;
 		}
@@ -298,7 +299,8 @@ public final class Skills {
 		if (mod > MAX_EXPERIENCE_MOD ) {
 			return MAX_EXPERIENCE_MOD;
 		}
-		return mod;
+		return 1.0;
+		//return mod;
 	}
 
 /**