Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-17 07:45:10 +01:00
Code Issues Projects Releases Wiki Activity

Fix #568

Browse Source
This commit is contained in:
Gabriele C 2016-05-29 17:36:36 +02:00
parent f5b7246d1d
commit be6ed07802
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/fr/xephi/authme/listener/AuthMeEntityListener.java
View File

@ -16,6 +16,9 @@ import org.bukkit.event.entity.FoodLevelChangeEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent; import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.projectiles.ProjectileSource; import org.bukkit.projectiles.ProjectileSource;
import fr.xephi.authme.ConsoleLogger;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import static fr.xephi.authme.listener.ListenerService.shouldCancelEvent; import static fr.xephi.authme.listener.ListenerService.shouldCancelEvent;
@ -87,7 +90,7 @@ public class AuthMeEntityListener implements Listener {
} }
} }
// TODO #568: Need to check this, player can't throw snowball but the item is taken. // In old versions of the Bukkit API getShooter() returns a Player Object instead of a ProjectileSource
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onProjectileLaunch(ProjectileLaunchEvent event) { public void onProjectileLaunch(ProjectileLaunchEvent event) {
if (event.getEntity() == null) { if (event.getEntity() == null) {
@ -103,14 +106,14 @@ public class AuthMeEntityListener implements Listener {
} }
player = (Player) shooter; player = (Player) shooter;
} else { } else {
// TODO #568 20151220: Invoking getShooter() with null but method isn't static
try { try {
if (getShooter == null) { if (getShooter == null) {
getShooter = Projectile.class.getMethod("getShooter"); getShooter = Projectile.class.getMethod("getShooter");
} }
Object obj = getShooter.invoke(null); Object obj = getShooter.invoke(projectile);
player = (Player) obj; player = (Player) obj;
} catch (Exception ignored) { } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
ConsoleLogger.logException("Error getting shooter", e);
} }
} }