Compare commits

..
2 Commits
Author SHA1 Message Date
Retrooper 636e246c70 attempt to fix error 2020-07-20 16:09:18 +08:00
Retrooper 0d5c7b5250 uninject exception error handled 2020-07-20 15:39:39 +08:00
@@ -7,6 +7,7 @@ import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
import io.github.retrooper.packetevents.event.impl.PlayerUninjectEvent;
import org.bukkit.entity.Player;
import java.util.NoSuchElementException;
import java.util.concurrent.Future;
public class NettyPacketHandler {
@@ -33,19 +34,24 @@ public class NettyPacketHandler {
}
public static Future<?> uninjectPlayer(final Player player) {
final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player, false);
PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
if (!uninjectEvent.isCancelled()) {
if (v1_7_nettyMode) {
return NettyPacketHandler_7.uninjectPlayer(player);
} else {
return NettyPacketHandler_8.uninjectPlayer(player);
try {
final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player, false);
PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
if (!uninjectEvent.isCancelled()) {
if (v1_7_nettyMode) {
return NettyPacketHandler_7.uninjectPlayer(player);
} else {
return NettyPacketHandler_8.uninjectPlayer(player);
}
}
} catch(Exception e) {
}
return null;
}
public static void uninjectPlayerNow(final Player player) {
try {
final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player, true);
PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent);
if (!uninjectEvent.isCancelled()) {
@@ -56,6 +62,11 @@ public class NettyPacketHandler {
}
}
}
catch(Exception e)
{
}
}
public static Object write(final Player sender, final Object packet) {
final String packetName = packet.getClass().getSimpleName();