mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
e4d10a6d67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
88 lines
2.6 KiB
Diff
88 lines
2.6 KiB
Diff
From 95814d0fc19ff644b9d7c04a93a16ec96b3c5b6a Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 4 Dec 2016 01:19:14 -0500
|
|
Subject: [PATCH] IllegalPacketEvent
|
|
|
|
Fire an event when an illegal packet is received to let plugins handle it
|
|
|
|
Lets plugins change the kick message and if it should kick or not.
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
|
|
new file mode 100644
|
|
index 000000000..37a17f0bb
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java
|
|
@@ -0,0 +1,70 @@
|
|
+package com.destroystokyo.paper.event.player;
|
|
+
|
|
+import org.bukkit.Bukkit;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+public class IllegalPacketEvent extends PlayerEvent {
|
|
+ @Nullable private final String type;
|
|
+ @Nullable private final String ex;
|
|
+ @Nullable private String kickMessage;
|
|
+ private boolean shouldKick = true;
|
|
+
|
|
+ public IllegalPacketEvent(@NotNull Player player, @Nullable String type, @Nullable String kickMessage, @NotNull Exception e) {
|
|
+ super(player);
|
|
+ this.type = type;
|
|
+ this.kickMessage = kickMessage;
|
|
+ this.ex = e.getMessage();
|
|
+ }
|
|
+
|
|
+ public boolean isShouldKick() {
|
|
+ return shouldKick;
|
|
+ }
|
|
+
|
|
+ public void setShouldKick(boolean shouldKick) {
|
|
+ this.shouldKick = shouldKick;
|
|
+ }
|
|
+
|
|
+ @Nullable
|
|
+ public String getKickMessage() {
|
|
+ return kickMessage;
|
|
+ }
|
|
+
|
|
+ public void setKickMessage(@Nullable String kickMessage) {
|
|
+ this.kickMessage = kickMessage;
|
|
+ }
|
|
+
|
|
+ @Nullable
|
|
+ public String getType() {
|
|
+ return type;
|
|
+ }
|
|
+
|
|
+ @Nullable
|
|
+ public String getExceptionMessage() {
|
|
+ return ex;
|
|
+ }
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+
|
|
+ @NotNull
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ public static void process(@NotNull Player player, @Nullable String type, @Nullable String kickMessage, @NotNull Exception exception) {
|
|
+ IllegalPacketEvent event = new IllegalPacketEvent(player, type, kickMessage, exception);
|
|
+ event.callEvent();
|
|
+ if (event.shouldKick) {
|
|
+ player.kickPlayer(kickMessage);
|
|
+ }
|
|
+ Bukkit.getLogger().severe(player.getName() + "/" + type + ": " + exception.getMessage());
|
|
+ }
|
|
+}
|
|
--
|
|
2.25.1
|
|
|