2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-07 16:49:07 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Fletching fix

Browse Source 
Should fix 2 people not being able to fletch at once. Let me know how it works - mr extremez :)
This commit is contained in:
Mr Extremez
2019-10-22 01:15:03 -05:00
committed by Dark98
parent ede6989139
commit 818ea68ae1
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/.classpath
+3
View File
@@ -8,6 +8,9 @@
<classpathentry kind="lib" path="libs/slf4j.jar"/> <classpathentry kind="lib" path="libs/slf4j.jar"/>
<classpathentry kind="lib" path="libs/xpp3-1.1.4c.jar"/> <classpathentry kind="lib" path="libs/xpp3-1.1.4c.jar"/>
<classpathentry kind="lib" path="libs/xstream-1.4.1.jar"/> <classpathentry kind="lib" path="libs/xstream-1.4.1.jar"/>
<classpathentry kind="lib" path="libs/everythingrs-api.jar"/>
<classpathentry kind="lib" path="libs/javacord-api-3.0.4.jar"/>
<classpathentry kind="lib" path="libs/json-20190722.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
2006Redone Server/.gitignore
+1
View File
@@ -0,0 +1 @@
/bin/
2006Redone Server/.settings/org.eclipse.jdt.core.prefs
+3 -3
View File
@@ -1,14 +1,14 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
2006Redone Server/src/redone/game/content/skills/fletching/LogCuttingInterface.java
+3 -4
View File
@@ -20,11 +20,10 @@ public class LogCuttingInterface {
} }
public static void Interface(Client c, int item) { public static void Interface(Client c, int item) {
if (c.playerIsFletching == true && item > 1510 && item < 1522) { if (c.playerIsFletching == true && (item > 1510 && item < 1522)) {
c.getActionSender().sendMessage("You are already fletching!"); LogCutting.resetFletching(c);
c.getPlayerAssistant().closeAllWindows();
return; return;
} else if (item < 1510 && item > 1521) { } else if (c.playerIsFletching == true && (item < 1510 || item > 1521)) {
c.playerIsFletching = false; c.playerIsFletching = false;
c.getActionSender().sendMessage("Nothing interesting happens."); c.getActionSender().sendMessage("Nothing interesting happens.");
} }
2006Redone Server/src/redone/game/npcs/Npc.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class Npc {
updateRequired = true; updateRequired = true;
} }
public boolean requestTransformTime(Client player, int itemId, int animation, final int currentId, final int newId, int transformTime, int npcId) { public boolean requestTransformTime(Client player, int itemId, int animation, final int currentId, final int newId, int transformTime, final int npcId) {
if (!player.getItemAssistant().playerHasItem(itemId)) { if (!player.getItemAssistant().playerHasItem(itemId)) {
player.getActionSender().sendMessage("You need " + ItemAssistant.getItemName(itemId).toLowerCase() + " to do that."); player.getActionSender().sendMessage("You need " + ItemAssistant.getItemName(itemId).toLowerCase() + " to do that.");
return false; return false;