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

Potential Partial Forge Fix

Browse Source
This commit is contained in:
Olof Larsson 2016-08-19 10:07:12 +02:00
parent 21e5fa877c
commit 76e7702d2f
No known key found for this signature in database
GPG Key ID: BBEF14F97DA52474
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/com/massivecraft/massivecore/engine/EngineMassiveCoreDatabase.java
View File

@ -11,7 +11,6 @@ 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;
import org.bukkit.event.player.AsyncPlayerPreLoginEvent; import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
import org.bukkit.event.player.AsyncPlayerPreLoginEvent.Result;
import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerLoginEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import com.massivecraft.massivecore.Engine; import com.massivecraft.massivecore.Engine;
@ -41,15 +40,24 @@ public class EngineMassiveCoreDatabase extends Engine
public static Map<String, PlayerLoginEvent> idToPlayerLoginEvent = new MassiveMap<String, PlayerLoginEvent>(); public static Map<String, PlayerLoginEvent> idToPlayerLoginEvent = new MassiveMap<String, PlayerLoginEvent>();
// This method sets the sender reference to what you decide. // Immediately set the sender reference and cached PlayerLoginEvent.
public static void setSenderReferences(CommandSender sender, CommandSender reference, PlayerLoginEvent event) public static void setSenderReferences(CommandSender sender, CommandSender reference, PlayerLoginEvent event)
{ {
// Check Sender
if (MUtil.isntSender(sender)) return; if (MUtil.isntSender(sender)) return;
// Get and Check Id
String id = IdUtil.getId(sender); String id = IdUtil.getId(sender);
if (id != null) if (id == null) return;
{
// Avoid Race Condition
// Explanation: Deferred removal could potentially happen after a new join.
if (reference == null && sender instanceof Player && ((Player)sender).isOnline()) return;
// Set References
SenderColl.setSenderReferences(id, reference); SenderColl.setSenderReferences(id, reference);
// Set Event
if (event == null) if (event == null)
{ {
idToPlayerLoginEvent.remove(id); idToPlayerLoginEvent.remove(id);
@ -59,25 +67,16 @@ public class EngineMassiveCoreDatabase extends Engine
idToPlayerLoginEvent.put(id, event); idToPlayerLoginEvent.put(id, event);
} }
} }
}
// This method sets the sender reference based on it's online state.
public static void setSenderReferences(Player player, PlayerLoginEvent event)
{
Player reference = player;
if ( ! player.isOnline()) reference = null;
setSenderReferences(player, reference, event);
}
// Same as above but next tick. // Same as above but next tick.
public static void setSenderReferencesSoon(final Player player, final PlayerLoginEvent event) public static void setSenderReferencesSoon(final CommandSender sender, final CommandSender reference, final PlayerLoginEvent event)
{ {
Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new Runnable() Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new Runnable()
{ {
@Override @Override
public void run() public void run()
{ {
setSenderReferences(player, event); setSenderReferences(sender, reference, event);
} }
}); });
} }
@ -85,14 +84,20 @@ public class EngineMassiveCoreDatabase extends Engine
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void setSenderReferencesLoginLowest(PlayerLoginEvent event) public void setSenderReferencesLoginLowest(PlayerLoginEvent event)
{ {
final Player player = event.getPlayer();
// We set the reference at LOWEST so that it's present during this PlayerLoginEvent event. // We set the reference at LOWEST so that it's present during this PlayerLoginEvent event.
setSenderReferences(player, player, event); setSenderReferences(event.getPlayer(), event.getPlayer(), event);
}
// And the next tick we update the reference based on it's online state. @EventHandler(priority = EventPriority.MONITOR)
// Not all players succeed in logging in. They may for example be banned. public void setSenderReferencesLoginMonitor(PlayerLoginEvent event)
setSenderReferencesSoon(player, null); {
// Not all logins are successful.
// If the login fails we remove the reference next tick.
// This way we have the reference available through all of the MONITOR phase.
// NOTE: We previously looked at player.isOnline() to determine login success.
// NOTE: This was however not feasible due to Forge reporting successfully logged in players as offline for a random amount of ticks.
if (event.getResult() == PlayerLoginEvent.Result.ALLOWED) return;
setSenderReferencesSoon(event.getPlayer(), null, null);
} }
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
@ -100,7 +105,7 @@ public class EngineMassiveCoreDatabase extends Engine
{ {
// PlayerQuitEvents are /probably/ trustworthy. // PlayerQuitEvents are /probably/ trustworthy.
// We check ourselves the next tick just to be on the safe side. // We check ourselves the next tick just to be on the safe side.
setSenderReferencesSoon(event.getPlayer(), null); setSenderReferencesSoon(event.getPlayer(), null, null);
} }
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
@ -185,7 +190,7 @@ public class EngineMassiveCoreDatabase extends Engine
// long before = System.nanoTime(); // long before = System.nanoTime();
// If the login was allowed ... // If the login was allowed ...
if (event.getLoginResult() != Result.ALLOWED) return; if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) return;
// ... get player id ... // ... get player id ...
final String playerId = event.getUniqueId().toString(); final String playerId = event.getUniqueId().toString();