Merge branch 'development' into patch-3

This commit is contained in:
Jeroen Ketelaar
2017-08-25 13:55:13 +02:00
committed by GitHub
2 changed files with 5 additions and 4 deletions
@@ -17,8 +17,9 @@ import org.rev317.min.api.wrappers.SceneObject;
public class Jail implements Random { public class Jail implements Random {
private Npc jailer; private Npc jailer;
private final int[] rocks = { 2093, 2092 };
private final int[] pickAxes = { 1266, 1268, 1270, 1272, 1274, 1276, 14605, 14608 }; private final int[] rocks = {7456, 7455, 7488};
private final int[] pickAxes = {1266, 1268, 1270, 1272, 1274, 1276, 14605, 14608};
@Override @Override
public boolean activate() { public boolean activate() {
@@ -87,7 +88,7 @@ public class Jail implements Random {
} }
private Npc getJailer() { private Npc getJailer() {
for (Npc jailer : Npcs.getNearest(201)) { for (Npc jailer : Npcs.getNearest(300)) {
if (jailer != null && jailer.getDef() != null) { if (jailer != null && jailer.getDef() != null) {
return jailer; return jailer;
} }
@@ -14,7 +14,7 @@ import org.rev317.min.api.wrappers.Npc;
public class SandwichLady implements Random { public class SandwichLady implements Random {
private Npc lady; private Npc lady;
private final int id = 3117; private final int id = 5510;
@Override @Override
public boolean activate() { public boolean activate() {