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

Fix slayer plugin setting config values to null

Browse Source 
null is not permitted in properties and throws an exception. Additionally mark value in setConfiguration as NonNull.
This commit is contained in:
Adam
2021-03-03 23:35:14 -05:00
parent fb5b4bf014
commit 60b8d3370f
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
View File

@@ -78,6 +78,7 @@ import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import javax.inject.Singleton; import javax.inject.Singleton;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Player; import net.runelite.api.Player;
@@ -482,7 +483,7 @@ public class ConfigManager
setConfiguration(groupName, null, key, value); setConfiguration(groupName, null, key, value);
} }
public void setConfiguration(String groupName, String profile, String key, String value) public void setConfiguration(String groupName, String profile, String key, @NonNull String value)
{ {
if (Strings.isNullOrEmpty(groupName) || Strings.isNullOrEmpty(key)) if (Strings.isNullOrEmpty(groupName) || Strings.isNullOrEmpty(key))
{ {

9
runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
View File

@@ -316,7 +316,14 @@ public class SlayerPlugin extends Plugin
private void setProfileConfig(String key, Object value) private void setProfileConfig(String key, Object value)
{ {
configManager.setRSProfileConfiguration(SlayerConfig.GROUP_NAME, key, value); if (value != null)
{
configManager.setRSProfileConfiguration(SlayerConfig.GROUP_NAME, key, value);
}
else
{
configManager.unsetRSProfileConfiguration(SlayerConfig.GROUP_NAME, key);
}
} }
private void save() private void save()

2
runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
View File

@@ -553,6 +553,8 @@ public class SlayerPluginTest
assertEquals("", slayerPlugin.getTaskName()); assertEquals("", slayerPlugin.getTaskName());
assertEquals(0, slayerPlugin.getAmount()); assertEquals(0, slayerPlugin.getAmount());
verify(configManager).unsetRSProfileConfiguration(SlayerConfig.GROUP_NAME, SlayerConfig.TASK_LOC_KEY);
} }
@Test @Test