Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-11-30 14:33:30 +01:00
Code Issues Projects Releases Wiki Activity

add null checks

Browse Source
This commit is contained in:
Sleaker 2012-01-31 16:40:25 -08:00
parent 7328977f21
commit cf7bc4079f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/net/milkbowl/vault/Metrics.java
View File

@ -51,6 +51,7 @@ import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.permissions.Permission; import org.bukkit.permissions.Permission;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.RegisteredServiceProvider;
/** /**
* Tooling to post to metrics.griefcraft.com * Tooling to post to metrics.griefcraft.com
@ -123,7 +124,11 @@ public class Metrics {
public void findCustomData(Vault plugin) { public void findCustomData(Vault plugin) {
// Add our Economy plotters // Add our Economy plotters
Economy econ = Bukkit.getServer().getServicesManager().getRegistration(Economy.class).getProvider(); RegisteredServiceProvider<Economy> rspEcon = Bukkit.getServer().getServicesManager().getRegistration(Economy.class);
Economy econ = null;
if (rspEcon != null) {
econ = rspEcon.getProvider();
}
final String econName = econ != null ? econ.getName() : "No Economy"; final String econName = econ != null ? econ.getName() : "No Economy";
addCustomData(plugin, new Metrics.Plotter() { addCustomData(plugin, new Metrics.Plotter() {
@ -153,7 +158,11 @@ public class Metrics {
} }
}); });
Chat chat = Bukkit.getServer().getServicesManager().getRegistration(Chat.class).getProvider(); RegisteredServiceProvider<Chat> rspChat = Bukkit.getServer().getServicesManager().getRegistration(Chat.class);
Chat chat = null;
if (rspChat != null) {
chat = rspChat.getProvider();
}
final String chatName = chat != null ? chat.getName() : "No Chat"; final String chatName = chat != null ? chat.getName() : "No Chat";
// Add our Chat Plotters // Add our Chat Plotters
addCustomData(plugin, new Metrics.Plotter() { addCustomData(plugin, new Metrics.Plotter() {