ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

VorkathHelper fix and FreezeTimers fix related to Vorkath (#1011)

Browse Source 
* vorkathhelper: fix attacks left not updating correctly

* freezetimers: fix timer after killing vorkath spawn, remove redundant class

* freezetimers: remove redundant imports
This commit is contained in:
Alexander
2019-07-16 18:22:39 +02:00
committed by Ganom
parent 41854dbc98
commit b75a4f1fa7
3 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java
View File

@@ -1,16 +0,0 @@
package net.runelite.client.plugins.freezetimers;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import net.runelite.api.Actor;
import net.runelite.api.coords.LocalPoint;
@Builder
class FreezeInfo
{
@Getter(AccessLevel.PACKAGE)
private final Actor actor;
@Getter(AccessLevel.PACKAGE)
private final LocalPoint freezePoint;
}

36
runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java
View File

@@ -25,25 +25,24 @@
package net.runelite.client.plugins.freezetimers;
import com.google.inject.Provides;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import lombok.AccessLevel;
import lombok.Getter;
import net.runelite.api.Actor;
import net.runelite.api.Client;
import net.runelite.api.Player;
import net.runelite.api.NPC;
import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick;
import net.runelite.api.events.NpcDespawned;
import net.runelite.api.events.SpotAnimationChanged;
import net.runelite.api.events.PlayerDespawned;
import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType;
import net.runelite.client.ui.overlay.OverlayManager;
import org.apache.commons.lang3.ArrayUtils;
@PluginDescriptor(
name = "Freeze Timers",
@@ -55,7 +54,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
@Singleton
public class FreezeTimersPlugin extends Plugin
{
private final Map<String, FreezeInfo> freezes = new HashMap<>();
private static final int VORKATH_REGION = 9023;
@Inject
private Client client;
@@ -155,19 +154,32 @@ public class FreezeTimersPlugin extends Plugin
}
@Subscribe
public void onPlayerDespawned(PlayerDespawned playerDespawned)
public void onNpcDespawned(NpcDespawned event)
{
final Player player = playerDespawned.getPlayer();
// All despawns ok: death, teleports, log out, runs away from screen
this.remove(player);
if (!isAtVorkath())
{
return;
}
final NPC npc = event.getNpc();
if (npc.getName() == null)
{
return;
}
if (npc.getName().equals("Zombified Spawn"))
{
timers.setTimerEnd(client.getLocalPlayer(), TimerType.FREEZE,
System.currentTimeMillis());
}
}
private void remove(Actor actor)
private boolean isAtVorkath()
{
freezes.remove(actor.getName());
return ArrayUtils.contains(client.getMapRegions(), VORKATH_REGION);
}
@Subscribe
public void onConfigChanged(ConfigChanged event)
{

6
runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
View File

@@ -221,13 +221,9 @@ public class VorkathPlugin extends Plugin
vorkath.updatePhase(Vorkath.Phase.FIRE_BALL);
vorkath.setAttacksLeft(vorkath.getAttacksLeft() - 1);
}
else if (vorkathAttack == VorkathAttack.FREEZE_BREATH && vorkath.getLastAttack() != VorkathAttack.ZOMBIFIED_SPAWN)
else if (vorkathAttack == VorkathAttack.FREEZE_BREATH || vorkathAttack == VorkathAttack.ZOMBIFIED_SPAWN)
{
vorkath.updatePhase(Vorkath.Phase.SPAWN);
vorkath.setAttacksLeft(vorkath.getAttacksLeft() - (vorkath.getAttacksLeft() / 2));
}
else if (vorkathAttack == VorkathAttack.ZOMBIFIED_SPAWN || (vorkath.getLastAttack() == VorkathAttack.ZOMBIFIED_SPAWN))
{
vorkath.setAttacksLeft(0);
}
else