Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delay Fetching Console. Fixes NPE on some servers. This has also been rectified for current servers by partial API disable.

Browse Source
This commit is contained in:
Olof Larsson 2016-04-18 09:07:25 +02:00
parent 69a96e7e6e
commit 0fd3a8a363
No known key found for this signature in database
GPG Key ID: BBEF14F97DA52474
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/massivecore/MassiveCoreMSponsorInfo.java
View File

@ -105,7 +105,7 @@ public class MassiveCoreMSponsorInfo extends Entity<MassiveCoreMSponsorInfo>
URL url = null; URL url = null;
try try
{ {
url = new URL("http://sponsorinfo.massivecraft.com/1/"); url = new URL("http://sponsorinfo.massivecraft.com/2/");
} }
catch (MalformedURLException e) catch (MalformedURLException e)
{ {

19
src/com/massivecraft/massivecore/engine/EngineMassiveCoreSponsor.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -42,7 +43,17 @@ public class EngineMassiveCoreSponsor extends Engine
{ {
if ( ! active) return; if ( ! active) return;
this.inform(IdUtil.getConsole()); // We delay informing the console.
// This is because the console may not exist when this engine is activated.
Bukkit.getScheduler().runTask(this.getPlugin(), new Runnable()
{
@Override
public void run()
{
ConsoleCommandSender console = IdUtil.getConsole();
inform(console);
}
});
} }
// -------------------------------------------- // // -------------------------------------------- //
@ -61,6 +72,9 @@ public class EngineMassiveCoreSponsor extends Engine
public void inform(final CommandSender sender) public void inform(final CommandSender sender)
{ {
// Fail Safe
if (sender == null) return;
// If enabled by mconf ... // If enabled by mconf ...
if ( ! MassiveCoreMConf.get().sponsorEnabled) return; if ( ! MassiveCoreMConf.get().sponsorEnabled) return;
@ -131,7 +145,8 @@ public class EngineMassiveCoreSponsor extends Engine
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPlayerJoin(PlayerJoinEvent event) public void onPlayerJoin(PlayerJoinEvent event)
{ {
this.inform(event.getPlayer()); Player player = event.getPlayer();
this.inform(player);
} }
} }