Commit b99683d8 authored by Marwolf's avatar Marwolf 💬

Merge branch '2.0.0' into '2.0.0'

Little fixes

See merge request open-rsc/Game!2238
parents 35febd58 2300095b
...@@ -207,7 +207,8 @@ public final class Mining implements ObjectActionListener, ...@@ -207,7 +207,8 @@ public final class Mining implements ObjectActionListener,
owner.playSound("mine"); owner.playSound("mine");
showBubble(owner, new Item(ItemId.IRON_PICKAXE.id())); showBubble(owner, new Item(ItemId.IRON_PICKAXE.id()));
owner.message("You swing your pick at the rock..."); owner.message("You swing your pick at the rock...");
owner.setBatchEvent(new BatchEvent(owner, 1800, "Mining", 1000 + retrytimes, true) { retrytimes = Constants.GameServer.BATCH_PROGRESSION ? Formulae.getRepeatTimes(owner, Skills.MINING) : retrytimes + 1000;
owner.setBatchEvent(new BatchEvent(owner, 1800, "Mining", retrytimes, true) {
@Override @Override
public void action() { public void action() {
final Item ore = new Item(def.getOreId()); final Item ore = new Item(def.getOreId());
......
...@@ -1923,8 +1923,8 @@ public final class Player extends Mob { ...@@ -1923,8 +1923,8 @@ public final class Player extends Mob {
public void setBatchEvent(BatchEvent batchEvent) { public void setBatchEvent(BatchEvent batchEvent) {
if (batchEvent != null) { if (batchEvent != null) {
batchEvent.getOwner().checkAndInterruptBatchEvent();
this.batchEvent = batchEvent; this.batchEvent = batchEvent;
Server.getServer().getEventHandler().removePlayersEvents(batchEvent.getOwner());
Server.getServer().getEventHandler().add(batchEvent); Server.getServer().getEventHandler().add(batchEvent);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment