moparisthebest/MoparClassic
1
0
Fork 0
mirror of https://github.com/moparisthebest/MoparClassic synced 2024-11-17 06:35:13 -05:00
Code Issues Releases Wiki Activity

Merge pull request #149 from Nemesis-/pre-beta

Browse Source 
Fixes few bugs (Hope it went right this time)
This commit is contained in:
CodeForFame 2012-05-08 10:26:51 -07:00
commit bbacb63801
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
GameServer/src/org/moparscape/msc/config/Formulae.java
View File

@ -132,7 +132,20 @@ public class Formulae {
}
return 1.0D;
}
public static int[] getBoltIDs() {
final int[] freeBolts = {190};
if(!Config.members) {
return freeBolts;
}
return boltIDs;
}
public static int[] getArrowIDs() {
final int[] freeArrows = {11};
if(!Config.members) {
return freeArrows;
}
return boltIDs;
}
/**
* Returns a power to assosiate with each arrow
*/

2
GameServer/src/org/moparscape/msc/gs/event/RangeEvent.java
View File

@ -92,7 +92,7 @@ public class RangeEvent extends DelayedEvent {
}
boolean xbow = DataConversions.inArray(Formulae.xbowIDs, bowID);
int arrowID = -1;
for (int aID : (xbow ? Formulae.boltIDs : Formulae.arrowIDs)) {
for (int aID : (xbow ? Formulae.getBoltIDs() : Formulae.getArrowIDs())) {
int slot = owner.getInventory().getLastIndexById(aID);
if (slot < 0) {
continue;

2
GameServer/src/org/moparscape/msc/gs/model/Npc.java
View File

@ -351,7 +351,7 @@ public class Npc extends Mob {
|| !p.nextTo(this)
|| !p.getLocation().inBounds(loc.minX - 4,
loc.minY - 4, loc.maxX + 4,
loc.maxY + 4)) {
loc.maxY + 4) || GameEngine.getTime() - p.getLastPing() > 60000) {
continue;
}