Merge remote-tracking branch 'runelite/master' into rl-upstream-16072020
# Conflicts: # cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java # http-api/pom.xml # http-api/src/main/java/net/runelite/http/api/account/AccountClient.java # http-api/src/main/java/net/runelite/http/api/chat/ChatClient.java # http-api/src/main/java/net/runelite/http/api/item/ItemClient.java # http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java # http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java # http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java # runelite-api/src/main/java/net/runelite/api/Client.java # runelite-api/src/main/java/net/runelite/api/EnumID.java # runelite-api/src/main/java/net/runelite/api/IndexDataBase.java # runelite-api/src/main/java/net/runelite/api/ItemComposition.java # runelite-api/src/main/java/net/runelite/api/PlayerComposition.java # runelite-api/src/main/java/net/runelite/api/ScriptID.java # runelite-api/src/main/java/net/runelite/api/VarbitComposition.java # runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java # runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java # runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java # runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java # runelite-client/src/main/java/net/runelite/client/RuneLite.java # runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java # runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java # runelite-client/src/main/java/net/runelite/client/SessionClient.java # runelite-client/src/main/java/net/runelite/client/account/SessionManager.java # runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java # runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java # runelite-client/src/main/java/net/runelite/client/game/ItemManager.java # runelite-client/src/main/java/net/runelite/client/game/WorldService.java # runelite-client/src/main/java/net/runelite/client/input/KeyListener.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java # runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java # runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java # runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java # runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java # runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java # runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java # runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java # runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java # runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java # runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java # runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java # runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java # runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidRoom.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RoomType.java # runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java # runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java # runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java # runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java # runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fletching.json # runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java # runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java # runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java # runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java # runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java # runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java
This commit is contained in:
ThatGamerBlue
@@ -35,9 +35,9 @@ import net.runelite.api.Sprite;
|
||||
import net.runelite.api.coords.LocalPoint;
|
||||
import net.runelite.api.coords.WorldArea;
|
||||
import net.runelite.api.coords.WorldPoint;
|
||||
import net.runelite.api.events.ActorDeath;
|
||||
import net.runelite.api.events.AnimationChanged;
|
||||
import net.runelite.api.events.HitsplatApplied;
|
||||
import net.runelite.api.events.PlayerDeath;
|
||||
import net.runelite.api.events.SpotAnimationChanged;
|
||||
import net.runelite.api.events.InteractingChanged;
|
||||
import net.runelite.api.events.OverheadTextChanged;
|
||||
@@ -247,12 +247,10 @@ public abstract class RSActorMixin implements RSActor
|
||||
{
|
||||
if (healthRatio == 0)
|
||||
{
|
||||
if (this instanceof Player)
|
||||
{
|
||||
final PlayerDeath event = new PlayerDeath((Player) this);
|
||||
client.getCallbacks().post(PlayerDeath.class, event);
|
||||
}
|
||||
else if (this instanceof RSNPC)
|
||||
final ActorDeath event = new ActorDeath(this);
|
||||
client.getCallbacks().post(ActorDeath.class, event);
|
||||
|
||||
if (this instanceof RSNPC)
|
||||
{
|
||||
((RSNPC) this).setDead(true);
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ public abstract class VarbitMixin implements RSClient
|
||||
return varbit;
|
||||
}
|
||||
|
||||
byte[] fileData = getConfigArchive().getConfigData(VARBITS_GROUP, id);
|
||||
byte[] fileData = getIndexConfig().getConfigData(VARBITS_GROUP, id);
|
||||
if (fileData == null)
|
||||
{
|
||||
return null;
|
||||
|
||||
Reference in New Issue
Block a user