diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 6f0b25aa..00000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,2499 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/libraries/EnumBitSet.xml b/.idea/libraries/EnumBitSet.xml deleted file mode 100644 index c113cccd..00000000 --- a/.idea/libraries/EnumBitSet.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/HikariCP_4_0_3.xml b/.idea/libraries/HikariCP_4_0_3.xml deleted file mode 100644 index 48f53f06..00000000 --- a/.idea/libraries/HikariCP_4_0_3.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/JDA_4_2_0_168_withDependencies_min.xml b/.idea/libraries/JDA_4_2_0_168_withDependencies_min.xml deleted file mode 100644 index c5c38a4d..00000000 --- a/.idea/libraries/JDA_4_2_0_168_withDependencies_min.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/joda_time_2_3.xml b/.idea/libraries/joda_time_2_3.xml deleted file mode 100644 index 8ee33c75..00000000 --- a/.idea/libraries/joda_time_2_3.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/json.xml b/.idea/libraries/json.xml deleted file mode 100644 index f6415a4e..00000000 --- a/.idea/libraries/json.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/json_simple_1_1_1.xml b/.idea/libraries/json_simple_1_1_1.xml deleted file mode 100644 index 965bd9d0..00000000 --- a/.idea/libraries/json_simple_1_1_1.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/mysql_connector_java_8_0_23.xml b/.idea/libraries/mysql_connector_java_8_0_23.xml deleted file mode 100644 index d721a7e8..00000000 --- a/.idea/libraries/mysql_connector_java_8_0_23.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/tinylog_1_3_5.xml b/.idea/libraries/tinylog_1_3_5.xml deleted file mode 100644 index 6ba783ff..00000000 --- a/.idea/libraries/tinylog_1_3_5.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 0e05be0c..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 7ec00e1c..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946d..00000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddf..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 97c0503f..00000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,594 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - { - "keyToString": { - "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true", - "Git.Branch.Popup.ShowAllRemotes": "true", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "jdk.selected.JAVA_MODULE": "corretto-1.8", - "last_opened_file_path": "C:/Users/fatbo/IdeaProjects/Server", - "project.structure.last.edited": "Libraries", - "project.structure.proportion": "0.15", - "project.structure.side.proportion": "0.2", - "run.code.analysis.last.selected.profile": "aDefault", - "settings.editor.selected.configurable": "configurable.group.build" - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1712367779387 - - - 1737515237688 - - - 1737515326661 - - - 1737583501062 - - - 1737586585870 - - - 1737595111610 - - - 1737597204148 - - - 1737600273867 - - - 1737600787792 - - - 1737601718953 - - - 1737602931883 - - - 1737671907453 - - - 1737671961502 - - - 1737687583521 - - - 1737687627428 - - - 1737689810776 - - - 1737720364136 - - - 1737720488464 - - - 1737721271643 - - - 1737721364029 - - - 1737721775478 - - - 1737813234358 - - - 1737836127709 - - - 1737836404643 - - - 1737836598500 - - - 1737836845709 - - - 1737838131800 - - - 1737844316321 - - - 1737844767422 - - - 1737848384568 - - - 1737848944869 - - - 1737849719778 - - - 1737852688835 - - - 1737852918588 - - - 1737853392783 - - - 1737902960502 - - - 1737903532265 - - - 1737933275648 - - - 1737934513500 - - - 1737934746103 - - - 1737937513382 - - - 1737939350351 - - - 1737940008048 - - - 1737941339822 - - - 1737992808829 - - - 1737993653916 - - - 1737993837085 - - - 1738001281197 - - - 1738003570322 - - - 1738004570958 - - - - - - - - - - - - - - - file://$PROJECT_DIR$/src/engine/net/client/ClientMessagePump.java - 2105 - - - file://$PROJECT_DIR$/src/engine/gameManager/MaintenanceManager.java - 68 - - - file://$PROJECT_DIR$/src/engine/objects/CharacterItemManager.java - 1152 - - - - - \ No newline at end of file diff --git a/Server.iml b/Server.iml deleted file mode 100644 index d7af8d64..00000000 --- a/Server.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/engine/objects/PlayerCombatStats.java b/src/engine/objects/PlayerCombatStats.java index d3ff5f52..87e03b2f 100644 --- a/src/engine/objects/PlayerCombatStats.java +++ b/src/engine/objects/PlayerCombatStats.java @@ -123,10 +123,10 @@ public class PlayerCombatStats { float masteryLevel = 0; if(this.owner.skills.containsKey(skill)) { - skillLevel = this.owner.skills.get(skill).getTotalSkillPercet(); + skillLevel = this.owner.skills.get(skill).getModifiedAmount(); } if(this.owner.skills.containsKey(mastery)) - masteryLevel = this.owner.skills.get(mastery).getTotalSkillPercet(); + masteryLevel = this.owner.skills.get(mastery).getModifiedAmount(); float stanceValue = 0.0f; float atrEnchants = 0;