3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-28 00:50:08 +01:00
Paper/nms-patches/PlayerConnection.patch

1672 Zeilen
92 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/PlayerConnection.java
+++ b/net/minecraft/server/PlayerConnection.java
2019-04-28 04:35:28 +02:00
@@ -18,6 +18,48 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+// CraftBukkit start
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
2016-02-29 22:32:46 +01:00
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.util.CraftChatMessage;
2018-07-15 02:00:00 +02:00
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.util.LazyPlayerSet;
+import org.bukkit.craftbukkit.util.Waitable;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.SignChangeEvent;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.event.inventory.CraftItemEvent;
+import org.bukkit.event.inventory.InventoryAction;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCreativeEvent;
+import org.bukkit.event.inventory.InventoryType.SlotType;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerAnimationEvent;
+import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerInteractAtEntityEvent;
2016-02-29 22:32:46 +01:00
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.event.player.PlayerKickEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerResourcePackStatusEvent;
+import org.bukkit.event.player.PlayerSwapHandItemsEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.PlayerToggleFlightEvent;
+import org.bukkit.event.player.PlayerToggleSneakEvent;
+import org.bukkit.event.player.PlayerToggleSprintEvent;
+import org.bukkit.inventory.CraftingInventory;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.util.NumberConversions;
+// CraftBukkit end
+
2019-04-23 04:00:00 +02:00
public class PlayerConnection implements PacketListenerPlayIn {
2016-02-29 22:32:46 +01:00
private static final Logger LOGGER = LogManager.getLogger();
2019-04-28 04:35:28 +02:00
@@ -28,7 +70,10 @@
2018-12-13 01:00:00 +01:00
private long lastKeepAlive;
private boolean awaitingKeepAlive;
2016-02-29 22:32:46 +01:00
private long h;
- private int chatThrottle;
+ // CraftBukkit start - multithreaded fields
+ private volatile int chatThrottle;
+ private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
private int j;
2019-04-23 04:00:00 +02:00
private final Int2ShortMap k = new Int2ShortOpenHashMap();
2016-02-29 22:32:46 +01:00
private double l;
2019-04-28 04:35:28 +02:00
@@ -60,7 +105,33 @@
2016-02-29 22:32:46 +01:00
networkmanager.setPacketListener(this);
this.player = entityplayer;
entityplayer.playerConnection = this;
+
+ // CraftBukkit start - add fields and methods
+ this.server = minecraftserver.server;
+ }
+
+ private final org.bukkit.craftbukkit.CraftServer server;
+ public boolean processedDisconnect;
+ private int lastTick = MinecraftServer.currentTick;
2016-02-29 22:32:46 +01:00
+ private int allowedPlayerTicks = 1;
+ private int lastDropTick = MinecraftServer.currentTick;
2017-04-20 14:10:31 +02:00
+ private int lastBookTick = MinecraftServer.currentTick;
+ private int dropCount = 0;
+ private static final int SURVIVAL_PLACE_DISTANCE_SQUARED = 6 * 6;
+ private static final int CREATIVE_PLACE_DISTANCE_SQUARED = 7 * 7;
+
+ // Get position of last block hit for BlockDamageLevel.STOPPED
+ private double lastPosX = Double.MAX_VALUE;
+ private double lastPosY = Double.MAX_VALUE;
+ private double lastPosZ = Double.MAX_VALUE;
+ private float lastPitch = Float.MAX_VALUE;
+ private float lastYaw = Float.MAX_VALUE;
+ private boolean justTeleported = false;
+
+ public CraftPlayer getPlayer() {
+ return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
}
+ // CraftBukkit end
2018-12-13 01:00:00 +01:00
public void tick() {
2016-11-17 02:41:03 +01:00
this.syncPosition();
2019-12-10 23:00:00 +01:00
@@ -109,7 +180,7 @@
2019-04-23 04:00:00 +02:00
this.minecraftServer.getMethodProfiler().enter("keepAlive");
2018-12-13 01:00:00 +01:00
long i = SystemUtils.getMonotonicMillis();
2018-12-13 01:00:00 +01:00
- if (i - this.lastKeepAlive >= 15000L) {
+ if (i - this.lastKeepAlive >= 25000L) { // CraftBukkit
if (this.awaitingKeepAlive) {
2020-06-25 02:00:00 +02:00
this.disconnect(new ChatMessage("disconnect.timeout"));
} else {
2019-12-10 23:00:00 +01:00
@@ -121,15 +192,21 @@
}
2019-04-23 04:00:00 +02:00
this.minecraftServer.getMethodProfiler().exit();
+ // CraftBukkit start
+ for (int spam; (spam = this.chatThrottle) > 0 && !chatSpamField.compareAndSet(this, spam, spam - 1); ) ;
+ /* Use thread-safe field access instead
if (this.chatThrottle > 0) {
--this.chatThrottle;
}
+ */
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
if (this.j > 0) {
--this.j;
}
2018-12-13 01:00:00 +01:00
if (this.player.F() > 0L && this.minecraftServer.getIdleTimeout() > 0 && SystemUtils.getMonotonicMillis() - this.player.F() > (long) (this.minecraftServer.getIdleTimeout() * 1000 * 60)) {
+ this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
2020-06-25 02:00:00 +02:00
this.disconnect(new ChatMessage("multiplayer.disconnect.idling"));
}
2019-12-10 23:00:00 +01:00
@@ -153,16 +230,46 @@
return this.minecraftServer.a(this.player.getProfile());
}
2017-05-30 13:25:59 +02:00
+ // CraftBukkit start
+ @Deprecated
2018-07-15 02:00:00 +02:00
public void disconnect(IChatBaseComponent ichatbasecomponent) {
SPIGOT-4441: Fix serializing Components to and from Legacy While cfeef75cd97 might of semi helped being able to save black text lore, it actually took a fundamental problem with the legacy serialization code and expanded it to break even more aspects of the server when dealing with Component to Legacy conversion. This is causing data loss in Spigot with cases such as setting an item name to white gets stripped resulting in it being italic. Additionally, things such as book pages have been returning black formatting codes for the end of the line even when the user doesn't have colors in the book. The root issue is that the "Default Color" system is fundamentally wrong. Components do not and should not care about what element of the game they are being used by, and that's what the default color system did. It results in components that if obtained from 1 source such as a Book where the default / rendered color is black, is then copied to another source such as an Entity name, the black is carried forward and shown in the Entity name, when in reality it should have been white. This commit reverts cfeef75cd97 and fixes the underlying serialization issues when it comes to Legacy to and From conversions. There was quite a number of issues with this code overall, in how it handles inserting color codes, new line parsing and such. Books was using mojangs own "getLegacyString" which doesn't match behavior. We also do not want to use Mojangs method as there is no guarantee they don't remove that in future. Plus, everything about books uses the CB implementation anyways, and it should be consistent (this was mandatory to avoid serialization format changes on old vs new) These changes as is results in Item Stacks already serialized will not change contents when they go to component and back, so this won't impact any existing data. Newly created books though for example will change behavior in that they will no longer insert black color codes in the serialized data and will only represent intentional color changes by the creator of the book. This will result in cleaner data on them, and books are the only thing I'm aware of that has a behavioral shift due to the likelyhood of the default color system kicking in on other parts of the string. A unit test has been added to verify integrity of serialization to ensure that any legacy string that is converted into Components will always re-encode back in the same way when going back to Legacy.
2020-06-01 11:19:42 +02:00
+ disconnect(CraftChatMessage.fromComponent(ichatbasecomponent));
2017-05-30 13:25:59 +02:00
+ }
+ // CraftBukkit end
+
+ public void disconnect(String s) {
+ // CraftBukkit start - fire PlayerKickEvent
2016-06-15 05:45:11 +02:00
+ if (this.processedDisconnect) {
+ return;
+ }
+ String leaveMessage = EnumChatFormat.YELLOW + this.player.getName() + " left the game.";
+
+ PlayerKickEvent event = new PlayerKickEvent(this.server.getPlayer(this.player), s, leaveMessage);
+
+ if (this.server.getServer().isRunning()) {
+ this.server.getPluginManager().callEvent(event);
+ }
+
+ if (event.isCancelled()) {
+ // Do not kick the player
+ return;
+ }
+ // Send the possibly modified leave message
+ s = event.getReason();
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
+ final ChatComponentText ichatbasecomponent = new ChatComponentText(s);
2017-05-30 13:25:59 +02:00
+
2018-07-15 02:00:00 +02:00
this.networkManager.sendPacket(new PacketPlayOutKickDisconnect(ichatbasecomponent), (future) -> {
this.networkManager.close(ichatbasecomponent);
});
+ this.a(ichatbasecomponent); // CraftBukkit - fire quit instantly
2016-02-29 22:32:46 +01:00
this.networkManager.stopReading();
2018-07-15 02:00:00 +02:00
MinecraftServer minecraftserver = this.minecraftServer;
NetworkManager networkmanager = this.networkManager;
this.networkManager.getClass();
2019-04-25 04:00:00 +02:00
- minecraftserver.executeSync(networkmanager::handleDisconnection);
2015-04-17 12:55:10 +02:00
+ // CraftBukkit - Don't wait
2018-07-15 02:00:00 +02:00
+ minecraftserver.postToMainThread(networkmanager::handleDisconnection);
}
2019-04-23 04:00:00 +02:00
@Override
2019-12-10 23:00:00 +01:00
@@ -203,7 +310,34 @@
2019-04-23 04:00:00 +02:00
double d9 = entity.getMot().g();
double d10 = d6 * d6 + d7 * d7 + d8 * d8;
2019-04-23 04:00:00 +02:00
- if (d10 - d9 > 100.0D && !this.isExemptPlayer()) {
+
+ // CraftBukkit start - handle custom speeds and skipped ticks
+ this.allowedPlayerTicks += (System.currentTimeMillis() / 50) - this.lastTick;
+ this.allowedPlayerTicks = Math.max(this.allowedPlayerTicks, 1);
+ this.lastTick = (int) (System.currentTimeMillis() / 50);
+
2016-11-17 02:41:03 +01:00
+ ++this.receivedMovePackets;
+ int i = this.receivedMovePackets - this.processedMovePackets;
+ if (i > Math.max(this.allowedPlayerTicks, 5)) {
+ PlayerConnection.LOGGER.debug(this.player.getName() + " is sending move packets too frequently (" + i + " packets since last tick)");
+ i = 1;
+ }
+
+ if (d10 > 0) {
+ allowedPlayerTicks -= 1;
+ } else {
+ allowedPlayerTicks = 20;
+ }
2018-07-15 02:00:00 +02:00
+ double speed;
+ if (player.abilities.isFlying) {
+ speed = player.abilities.flySpeed * 20f;
+ } else {
+ speed = player.abilities.walkSpeed * 10f;
+ }
+ speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
+
2019-04-23 04:00:00 +02:00
+ if (d10 - d9 > Math.max(100.0D, Math.pow((double) (10.0F * (float) i * speed), 2)) && !this.isExemptPlayer()) {
+ // CraftBukkit end
2018-12-06 00:00:00 +01:00
PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", entity.getDisplayName().getString(), this.player.getDisplayName().getString(), d6, d7, d8);
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
return;
2019-12-10 23:00:00 +01:00
@@ -233,14 +367,72 @@
2018-09-26 09:19:16 +02:00
}
entity.setLocation(d3, d4, d5, f, f1);
+ player.setLocation(d3, d4, d5, this.player.yaw, this.player.pitch); // CraftBukkit
2018-09-26 09:19:16 +02:00
boolean flag2 = worldserver.getCubes(entity, entity.getBoundingBox().shrink(0.0625D));
if (flag && (flag1 || !flag2)) {
entity.setLocation(d0, d1, d2, f, f1);
+ player.setLocation(d0, d1, d2, this.player.yaw, this.player.pitch); // CraftBukkit
2018-09-26 09:19:16 +02:00
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
2016-02-29 22:32:46 +01:00
return;
}
2016-02-29 22:32:46 +01:00
2015-05-22 15:33:34 +02:00
+ // CraftBukkit start - fire PlayerMoveEvent
+ Player player = this.getPlayer();
+ Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
+ Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
+
+ // If the packet contains movement information then we update the To location with the correct XYZ.
2016-02-29 22:32:46 +01:00
+ to.setX(packetplayinvehiclemove.getX());
+ to.setY(packetplayinvehiclemove.getY());
+ to.setZ(packetplayinvehiclemove.getZ());
+
+
2015-05-22 15:33:34 +02:00
+ // If the packet contains look information then we update the To location with the correct Yaw & Pitch.
2016-02-29 22:32:46 +01:00
+ to.setYaw(packetplayinvehiclemove.getYaw());
+ to.setPitch(packetplayinvehiclemove.getPitch());
+
2015-05-22 15:33:34 +02:00
+ // Prevent 40 event-calls for less than a single pixel of movement >.>
+ double delta = Math.pow(this.lastPosX - to.getX(), 2) + Math.pow(this.lastPosY - to.getY(), 2) + Math.pow(this.lastPosZ - to.getZ(), 2);
+ float deltaAngle = Math.abs(this.lastYaw - to.getYaw()) + Math.abs(this.lastPitch - to.getPitch());
+
2016-11-17 02:41:03 +01:00
+ if ((delta > 1f / 256 || deltaAngle > 10f) && !this.player.isFrozen()) {
2015-05-22 15:33:34 +02:00
+ this.lastPosX = to.getX();
+ this.lastPosY = to.getY();
+ this.lastPosZ = to.getZ();
+ this.lastYaw = to.getYaw();
+ this.lastPitch = to.getPitch();
+
+ // Skip the first time we do this
+ if (from.getX() != Double.MAX_VALUE) {
+ Location oldTo = to.clone();
+ PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
+ this.server.getPluginManager().callEvent(event);
+
+ // If the event is cancelled we move the player back to their old location.
+ if (event.isCancelled()) {
+ teleport(from);
2015-05-22 15:33:34 +02:00
+ return;
+ }
2016-02-29 22:32:46 +01:00
+
+ // If a Plugin has changed the To destination then we teleport the Player
+ // there to avoid any 'Moved wrongly' or 'Moved too quickly' errors.
+ // We only do this if the Event was not cancelled.
2015-05-22 15:33:34 +02:00
+ if (!oldTo.equals(event.getTo()) && !event.isCancelled()) {
+ this.player.getBukkitEntity().teleport(event.getTo(), PlayerTeleportEvent.TeleportCause.PLUGIN);
2015-05-22 15:33:34 +02:00
+ return;
+ }
2015-04-15 17:24:53 +02:00
+
2016-02-29 22:32:46 +01:00
+ // Check to see if the Players Location has some how changed during the call of the event.
+ // This can happen due to a plugin teleporting the player instead of using .setTo()
2015-05-22 15:33:34 +02:00
+ if (!from.equals(this.getPlayer().getLocation()) && this.justTeleported) {
+ this.justTeleported = false;
+ return;
+ }
+ }
+ }
2016-02-29 22:32:46 +01:00
+ // CraftBukkit end
+
2019-04-23 04:00:00 +02:00
this.player.getWorldServer().getChunkProvider().movePlayer(this.player);
2019-12-10 23:00:00 +01:00
this.player.checkMovement(this.player.locX() - d0, this.player.locY() - d1, this.player.locZ() - d2);
2020-06-25 02:00:00 +02:00
this.D = d11 >= -0.03125D && !this.minecraftServer.getAllowFlight() && this.a(entity);
@@ -259,7 +451,7 @@
2019-04-23 04:00:00 +02:00
@Override
2017-10-01 08:29:03 +02:00
public void a(PacketPlayInTeleportAccept packetplayinteleportaccept) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinteleportaccept, this, this.player.getWorldServer());
- if (packetplayinteleportaccept.b() == this.teleportAwait) {
+ if (packetplayinteleportaccept.b() == this.teleportAwait && this.teleportPos != null) { // CraftBukkit
2017-10-01 08:29:03 +02:00
this.player.setLocation(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
2018-08-26 04:00:00 +02:00
this.o = this.teleportPos.x;
this.p = this.teleportPos.y;
2020-06-25 02:00:00 +02:00
@@ -269,6 +461,7 @@
}
this.teleportPos = null;
2019-04-23 04:00:00 +02:00
+ this.player.getWorldServer().getChunkProvider().movePlayer(this.player); // CraftBukkit
}
}
2020-06-25 02:00:00 +02:00
@@ -277,7 +470,7 @@
2019-04-23 04:00:00 +02:00
public void a(PacketPlayInRecipeDisplayed packetplayinrecipedisplayed) {
PlayerConnectionUtils.ensureMainThread(packetplayinrecipedisplayed, this, this.player.getWorldServer());
if (packetplayinrecipedisplayed.b() == PacketPlayInRecipeDisplayed.Status.SHOWN) {
- Optional optional = this.minecraftServer.getCraftingManager().a(packetplayinrecipedisplayed.c());
+ Optional<? extends IRecipe<?>> optional = this.minecraftServer.getCraftingManager().a(packetplayinrecipedisplayed.c()); // CraftBukkit - decompile error
RecipeBookServer recipebookserver = this.player.B();
optional.ifPresent(recipebookserver::e);
2020-06-25 02:00:00 +02:00
@@ -311,6 +504,12 @@
2019-04-23 04:00:00 +02:00
@Override
2018-07-15 02:00:00 +02:00
public void a(PacketPlayInTabComplete packetplayintabcomplete) {
PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer());
+ // CraftBukkit start
+ if (chatSpamField.addAndGet(this, 1) > 500 && !this.minecraftServer.getPlayerList().isOp(this.player.getProfile())) {
2018-07-15 02:00:00 +02:00
+ this.disconnect(new ChatMessage("disconnect.spam", new Object[0]));
+ return;
+ }
+ // CraftBukkit end
2018-08-26 04:00:00 +02:00
StringReader stringreader = new StringReader(packetplayintabcomplete.c());
2018-12-25 22:00:00 +01:00
if (stringreader.canRead() && stringreader.peek() == '/') {
2020-06-25 02:00:00 +02:00
@@ -320,6 +519,7 @@
2018-12-25 22:00:00 +01:00
ParseResults<CommandListenerWrapper> parseresults = this.minecraftServer.getCommandDispatcher().a().parse(stringreader, this.player.getCommandListener());
2018-07-15 02:00:00 +02:00
this.minecraftServer.getCommandDispatcher().a().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
2020-06-25 02:00:00 +02:00
+ if (suggestions.isEmpty()) return; // CraftBukkit - don't send through empty suggestions - prevents [<args>] from showing for plugins with nothing more to offer
this.networkManager.sendPacket(new PacketPlayOutTabComplete(packetplayintabcomplete.b(), suggestions));
2018-07-15 02:00:00 +02:00
});
}
2020-06-25 02:00:00 +02:00
@@ -548,6 +748,7 @@
2019-04-28 04:35:28 +02:00
if (container instanceof ContainerMerchant) {
ContainerMerchant containermerchant = (ContainerMerchant) container;
+ CraftEventFactory.callTradeSelectEvent(this.player, i, containermerchant); // CraftBukkit
containermerchant.d(i);
containermerchant.g(i);
2020-06-25 02:00:00 +02:00
@@ -558,6 +759,14 @@
2019-04-23 04:00:00 +02:00
@Override
2018-07-15 02:00:00 +02:00
public void a(PacketPlayInBEdit packetplayinbedit) {
2019-12-10 23:00:00 +01:00
PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer());
2018-07-15 02:00:00 +02:00
+ // CraftBukkit start
+ if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
+ this.disconnect("Book edited too quickly!");
+ return;
+ }
+ this.lastBookTick = MinecraftServer.currentTick;
2018-08-26 04:00:00 +02:00
+ EnumItemSlot enumitemslot = packetplayinbedit.d() == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND;
2018-07-15 02:00:00 +02:00
+ // CraftBukkit end
ItemStack itemstack = packetplayinbedit.b();
if (!itemstack.isEmpty()) {
2020-06-25 02:00:00 +02:00
@@ -586,9 +795,11 @@
2018-07-15 02:00:00 +02:00
}
2019-04-23 04:00:00 +02:00
itemstack2.a("pages", (NBTBase) nbttaglist);
- this.player.a(packetplayinbedit.d(), itemstack2);
+ this.player.a(packetplayinbedit.d(), CraftEventFactory.handleEditBookEvent(player, enumitemslot, itemstack1, itemstack2)); // CraftBukkit
} else {
+ ItemStack old = itemstack1.cloneItemStack(); // CraftBukkit
itemstack1.a("pages", (NBTBase) itemstack.getTag().getList("pages", 8));
+ CraftEventFactory.handleEditBookEvent(player, enumitemslot, old, itemstack1); // CraftBukkit
2018-07-15 02:00:00 +02:00
}
2019-04-23 04:00:00 +02:00
}
2018-07-15 02:00:00 +02:00
2020-06-25 02:00:00 +02:00
@@ -630,7 +841,7 @@
} else {
2020-06-25 02:00:00 +02:00
WorldServer worldserver = this.player.getWorldServer();
- if (!this.player.viewingCredits) {
2016-11-17 02:41:03 +01:00
+ if (!this.player.viewingCredits && !this.player.isFrozen()) { // CraftBukkit
if (this.e == 0) {
2016-11-17 02:41:03 +01:00
this.syncPosition();
}
2020-06-25 02:00:00 +02:00
@@ -640,13 +851,21 @@
2016-02-29 22:32:46 +01:00
this.A = this.e;
this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
}
-
+ this.allowedPlayerTicks = 20; // CraftBukkit
} else {
this.A = this.e;
if (this.player.isPassenger()) {
2019-12-10 23:00:00 +01:00
this.player.setLocation(this.player.locX(), this.player.locY(), this.player.locZ(), packetplayinflying.a(this.player.yaw), packetplayinflying.b(this.player.pitch));
2019-04-23 04:00:00 +02:00
this.player.getWorldServer().getChunkProvider().movePlayer(this.player);
2016-02-29 22:32:46 +01:00
+ this.allowedPlayerTicks = 20; // CraftBukkit
} else {
+ // CraftBukkit - Make sure the move is valid but then reset it for plugins to modify
2019-12-10 23:00:00 +01:00
+ double prevX = player.locX();
+ double prevY = player.locY();
+ double prevZ = player.locZ();
+ float prevYaw = player.yaw;
+ float prevPitch = player.pitch;
+ // CraftBukkit end
2019-12-10 23:00:00 +01:00
double d0 = this.player.locX();
double d1 = this.player.locY();
double d2 = this.player.locZ();
2020-06-25 02:00:00 +02:00
@@ -671,15 +890,33 @@
2016-12-20 21:00:00 +01:00
++this.receivedMovePackets;
int i = this.receivedMovePackets - this.processedMovePackets;
- if (i > 5) {
+ // CraftBukkit start - handle custom speeds and skipped ticks
+ this.allowedPlayerTicks += (System.currentTimeMillis() / 50) - this.lastTick;
+ this.allowedPlayerTicks = Math.max(this.allowedPlayerTicks, 1);
+ this.lastTick = (int) (System.currentTimeMillis() / 50);
+
+ if (i > Math.max(this.allowedPlayerTicks, 5)) {
2018-12-06 00:00:00 +01:00
PlayerConnection.LOGGER.debug("{} is sending move packets too frequently ({} packets since last tick)", this.player.getDisplayName().getString(), i);
2016-12-20 21:00:00 +01:00
i = 1;
}
2015-05-22 15:33:34 +02:00
2016-12-20 21:00:00 +01:00
+ if (packetplayinflying.hasLook || d11 > 0) {
+ allowedPlayerTicks -= 1;
+ } else {
+ allowedPlayerTicks = 20;
+ }
2018-07-15 02:00:00 +02:00
+ double speed;
2016-12-20 21:00:00 +01:00
+ if (player.abilities.isFlying) {
+ speed = player.abilities.flySpeed * 20f;
+ } else {
+ speed = player.abilities.walkSpeed * 10f;
+ }
2016-02-29 22:32:46 +01:00
+
2019-06-21 12:00:00 +02:00
if (!this.player.H() && (!this.player.getWorldServer().getGameRules().getBoolean(GameRules.DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isGliding())) {
2019-04-23 04:00:00 +02:00
float f2 = this.player.isGliding() ? 300.0F : 100.0F;
2016-02-29 22:32:46 +01:00
2019-04-23 04:00:00 +02:00
- if (d11 - d10 > (double) (f2 * (float) i) && !this.isExemptPlayer()) {
+ if (d11 - d10 > Math.max(f2, Math.pow((double) (10.0F * (float) i * speed), 2)) && !this.isExemptPlayer()) {
2016-12-20 21:00:00 +01:00
+ // CraftBukkit end
2018-12-06 00:00:00 +01:00
PlayerConnection.LOGGER.warn("{} moved too quickly! {},{},{}", this.player.getDisplayName().getString(), d7, d8, d9);
2019-12-10 23:00:00 +01:00
this.a(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch);
2016-12-20 21:00:00 +01:00
return;
@@ -698,6 +935,7 @@
}
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
+ this.player.c(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
double d12 = d8;
d7 = d4 - this.player.locX();
@@ -719,10 +957,74 @@
2020-06-25 02:00:00 +02:00
if (!this.player.noclip && !this.player.isSleeping() && (flag1 && worldserver.getCubes(this.player, axisalignedbb) || this.a((IWorldReader) worldserver, axisalignedbb))) {
this.a(d0, d1, d2, f, f1);
} else {
- this.B = d12 >= -0.03125D && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR && !this.minecraftServer.getAllowFlight() && !this.player.abilities.canFly && !this.player.hasEffect(MobEffects.LEVITATION) && !this.player.isGliding() && this.a((Entity) this.player);
+ // CraftBukkit start - fire PlayerMoveEvent
+ // Rest to old location first
+ this.player.setLocation(prevX, prevY, prevZ, prevYaw, prevPitch);
+
+ Player player = this.getPlayer();
+ Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
+ Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
+
+ // If the packet contains movement information then we update the To location with the correct XYZ.
+ if (packetplayinflying.hasPos) {
+ to.setX(packetplayinflying.x);
+ to.setY(packetplayinflying.y);
+ to.setZ(packetplayinflying.z);
+ }
2016-02-29 22:32:46 +01:00
+
2020-06-25 02:00:00 +02:00
+ // If the packet contains look information then we update the To location with the correct Yaw & Pitch.
+ if (packetplayinflying.hasLook) {
+ to.setYaw(packetplayinflying.yaw);
+ to.setPitch(packetplayinflying.pitch);
+ }
2016-02-29 22:32:46 +01:00
+
2020-06-25 02:00:00 +02:00
+ // Prevent 40 event-calls for less than a single pixel of movement >.>
+ double delta = Math.pow(this.lastPosX - to.getX(), 2) + Math.pow(this.lastPosY - to.getY(), 2) + Math.pow(this.lastPosZ - to.getZ(), 2);
+ float deltaAngle = Math.abs(this.lastYaw - to.getYaw()) + Math.abs(this.lastPitch - to.getPitch());
+
+ if ((delta > 1f / 256 || deltaAngle > 10f) && !this.player.isFrozen()) {
+ this.lastPosX = to.getX();
+ this.lastPosY = to.getY();
+ this.lastPosZ = to.getZ();
+ this.lastYaw = to.getYaw();
+ this.lastPitch = to.getPitch();
+
+ // Skip the first time we do this
+ if (from.getX() != Double.MAX_VALUE) {
+ Location oldTo = to.clone();
+ PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
+ this.server.getPluginManager().callEvent(event);
+
+ // If the event is cancelled we move the player back to their old location.
+ if (event.isCancelled()) {
+ teleport(from);
+ return;
+ }
2016-02-29 22:32:46 +01:00
+
2020-06-25 02:00:00 +02:00
+ // If a Plugin has changed the To destination then we teleport the Player
+ // there to avoid any 'Moved wrongly' or 'Moved too quickly' errors.
+ // We only do this if the Event was not cancelled.
+ if (!oldTo.equals(event.getTo()) && !event.isCancelled()) {
+ this.player.getBukkitEntity().teleport(event.getTo(), PlayerTeleportEvent.TeleportCause.PLUGIN);
+ return;
+ }
2016-02-29 22:32:46 +01:00
+
2020-06-25 02:00:00 +02:00
+ // Check to see if the Players Location has some how changed during the call of the event.
+ // This can happen due to a plugin teleporting the player instead of using .setTo()
+ if (!from.equals(this.getPlayer().getLocation()) && this.justTeleported) {
+ this.justTeleported = false;
+ return;
+ }
2016-12-20 21:00:00 +01:00
+ }
2016-02-29 22:32:46 +01:00
+ }
2020-06-25 02:00:00 +02:00
+ this.player.setLocation(d4, d5, d6, f, f1); // Copied from above
+
+ // MC-135989, SPIGOT-5564: isRiptiding
+ this.B = d12 >= -0.03125D && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR && !this.minecraftServer.getAllowFlight() && !this.player.abilities.canFly && !this.player.hasEffect(MobEffects.LEVITATION) && !this.player.isGliding() && this.a((Entity) this.player) && !this.player.isRiptiding();
+ // CraftBukkit end
this.player.getWorldServer().getChunkProvider().movePlayer(this.player);
this.player.a(this.player.locY() - d3, packetplayinflying.b());
- this.player.c(packetplayinflying.b());
+ // this.player.c(packetplayinflying.b()); // CraftBukkit - moved up
if (flag) {
this.player.fallDistance = 0.0F;
}
@@ -751,10 +1053,66 @@
2015-02-26 23:41:06 +01:00
}
public void a(double d0, double d1, double d2, float f, float f1) {
- this.a(d0, d1, d2, f, f1, Collections.emptySet());
+ this.a(d0, d1, d2, f, f1, Collections.<PacketPlayOutPosition.EnumPlayerTeleportFlags>emptySet());
+ }
+
+ // CraftBukkit start - Delegate to teleport(Location)
+ public void a(double d0, double d1, double d2, float f, float f1, PlayerTeleportEvent.TeleportCause cause) {
+ this.a(d0, d1, d2, f, f1, Collections.<PacketPlayOutPosition.EnumPlayerTeleportFlags>emptySet(), cause);
}
public void a(double d0, double d1, double d2, float f, float f1, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set) {
+ this.a(d0, d1, d2, f, f1, set, PlayerTeleportEvent.TeleportCause.UNKNOWN);
+ }
+
+ public void a(double d0, double d1, double d2, float f, float f1, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set, PlayerTeleportEvent.TeleportCause cause) {
+ Player player = this.getPlayer();
+ Location from = player.getLocation();
+
+ double x = d0;
+ double y = d1;
+ double z = d2;
+ float yaw = f;
+ float pitch = f1;
+
+ Location to = new Location(this.getPlayer().getWorld(), x, y, z, yaw, pitch);
+ // SPIGOT-5171: Triggered on join
+ if (from.equals(to)) {
+ this.internalTeleport(d0, d1, d2, f, f1, set);
+ return;
+ }
+
+ PlayerTeleportEvent event = new PlayerTeleportEvent(player, from.clone(), to.clone(), cause);
+ this.server.getPluginManager().callEvent(event);
+
+ if (event.isCancelled() || !to.equals(event.getTo())) {
+ set.clear(); // Can't relative teleport
+ to = event.isCancelled() ? event.getFrom() : event.getTo();
+ d0 = to.getX();
+ d1 = to.getY();
+ d2 = to.getZ();
+ f = to.getYaw();
+ f1 = to.getPitch();
+ }
+
+ this.internalTeleport(d0, d1, d2, f, f1, set);
+ }
+
+ public void teleport(Location dest) {
2016-11-17 02:41:03 +01:00
+ internalTeleport(dest.getX(), dest.getY(), dest.getZ(), dest.getYaw(), dest.getPitch(), Collections.<PacketPlayOutPosition.EnumPlayerTeleportFlags>emptySet());
+ }
+
2016-11-17 02:41:03 +01:00
+ private void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set) {
+ // CraftBukkit start
+ if (Float.isNaN(f)) {
+ f = 0;
+ }
+ if (Float.isNaN(f1)) {
+ f1 = 0;
+ }
+
2016-11-17 02:41:03 +01:00
+ this.justTeleported = true;
+ // CraftBukkit end
2019-12-10 23:00:00 +01:00
double d3 = set.contains(PacketPlayOutPosition.EnumPlayerTeleportFlags.X) ? this.player.locX() : 0.0D;
double d4 = set.contains(PacketPlayOutPosition.EnumPlayerTeleportFlags.Y) ? this.player.locY() : 0.0D;
double d5 = set.contains(PacketPlayOutPosition.EnumPlayerTeleportFlags.Z) ? this.player.locZ() : 0.0D;
@@ -766,6 +1124,14 @@
2018-07-15 02:00:00 +02:00
this.teleportAwait = 0;
}
+ // CraftBukkit start - update last location
2016-02-29 22:32:46 +01:00
+ this.lastPosX = this.teleportPos.x;
+ this.lastPosY = this.teleportPos.y;
+ this.lastPosZ = this.teleportPos.z;
+ this.lastYaw = f;
+ this.lastPitch = f1;
+ // CraftBukkit end
+
2018-07-15 02:00:00 +02:00
this.A = this.e;
this.player.setLocation(d0, d1, d2, f, f1);
this.player.playerConnection.sendPacket(new PacketPlayOutPosition(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.teleportAwait));
@@ -774,6 +1140,7 @@
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInBlockDig packetplayinblockdig) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinblockdig, this, this.player.getWorldServer());
2016-11-17 02:41:03 +01:00
+ if (this.player.isFrozen()) return; // CraftBukkit
2018-07-15 02:00:00 +02:00
BlockPosition blockposition = packetplayinblockdig.b();
2019-07-20 01:00:00 +02:00
this.player.resetIdleTimer();
@@ -784,14 +1151,46 @@
2019-05-27 22:30:00 +02:00
if (!this.player.isSpectator()) {
ItemStack itemstack = this.player.b(EnumHand.OFF_HAND);
- this.player.a(EnumHand.OFF_HAND, this.player.b(EnumHand.MAIN_HAND));
- this.player.a(EnumHand.MAIN_HAND, itemstack);
+ // CraftBukkit start - inspiration taken from DispenserRegistry (See SpigotCraft#394)
+ CraftItemStack mainHand = CraftItemStack.asCraftMirror(itemstack);
+ CraftItemStack offHand = CraftItemStack.asCraftMirror(this.player.b(EnumHand.MAIN_HAND));
+ PlayerSwapHandItemsEvent swapItemsEvent = new PlayerSwapHandItemsEvent(getPlayer(), mainHand.clone(), offHand.clone());
+ this.server.getPluginManager().callEvent(swapItemsEvent);
+ if (swapItemsEvent.isCancelled()) {
+ return;
+ }
2019-05-27 22:30:00 +02:00
+ if (swapItemsEvent.getOffHandItem().equals(offHand)) {
+ this.player.a(EnumHand.OFF_HAND, this.player.b(EnumHand.MAIN_HAND));
+ } else {
+ this.player.a(EnumHand.OFF_HAND, CraftItemStack.asNMSCopy(swapItemsEvent.getOffHandItem()));
+ }
+ if (swapItemsEvent.getMainHandItem().equals(mainHand)) {
+ this.player.a(EnumHand.MAIN_HAND, itemstack);
+ } else {
+ this.player.a(EnumHand.MAIN_HAND, CraftItemStack.asNMSCopy(swapItemsEvent.getMainHandItem()));
+ }
+ // CraftBukkit end
2020-06-25 02:00:00 +02:00
this.player.clearActiveItem();
2019-05-27 22:30:00 +02:00
}
2019-05-27 22:30:00 +02:00
return;
case DROP_ITEM:
if (!this.player.isSpectator()) {
+ // limit how quickly items can be dropped
+ // If the ticks aren't the same then the count starts from 0 and we update the lastDropTick.
+ if (this.lastDropTick != MinecraftServer.currentTick) {
+ this.dropCount = 0;
+ this.lastDropTick = MinecraftServer.currentTick;
+ } else {
+ // Else we increment the drop count and check the amount.
+ this.dropCount++;
+ if (this.dropCount >= 20) {
+ LOGGER.warn(this.player.getName() + " dropped their items too quickly!");
+ this.disconnect("You dropped your items too quickly (Hacking?)");
+ return;
+ }
2019-05-27 22:30:00 +02:00
+ }
+ // CraftBukkit end
2020-06-25 02:00:00 +02:00
this.player.dropItem(false);
2019-05-27 22:30:00 +02:00
}
@@ -828,6 +1227,7 @@
2019-04-23 04:00:00 +02:00
@Override
2016-02-29 22:32:46 +01:00
public void a(PacketPlayInUseItem packetplayinuseitem) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinuseitem, this, this.player.getWorldServer());
2016-11-17 02:41:03 +01:00
+ if (this.player.isFrozen()) return; // CraftBukkit
2020-06-25 02:00:00 +02:00
WorldServer worldserver = this.player.getWorldServer();
2019-04-23 04:00:00 +02:00
EnumHand enumhand = packetplayinuseitem.b();
2016-02-29 22:32:46 +01:00
ItemStack itemstack = this.player.b(enumhand);
@@ -838,6 +1238,14 @@
2020-06-25 02:00:00 +02:00
this.player.resetIdleTimer();
if (blockposition.getY() < this.minecraftServer.getMaxBuildHeight()) {
if (this.teleportPos == null && this.player.g((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && worldserver.a((EntityHuman) this.player, blockposition)) {
+ // CraftBukkit start - Check if we can actually do something over this large a distance
+ Location eyeLoc = this.getPlayer().getEyeLocation();
+ double reachDistance = NumberConversions.square(eyeLoc.getX() - blockposition.getX()) + NumberConversions.square(eyeLoc.getY() - blockposition.getY()) + NumberConversions.square(eyeLoc.getZ() - blockposition.getZ());
+ if (reachDistance > (this.getPlayer().getGameMode() == org.bukkit.GameMode.CREATIVE ? CREATIVE_PLACE_DISTANCE_SQUARED : SURVIVAL_PLACE_DISTANCE_SQUARED)) {
+ return;
+ }
+ this.player.clearActiveItem(); // SPIGOT-4706
+ // CraftBukkit end
EnumInteractionResult enuminteractionresult = this.player.playerInteractManager.a(this.player, worldserver, itemstack, enumhand, movingobjectpositionblock);
2016-02-29 22:32:46 +01:00
2020-06-25 02:00:00 +02:00
if (enumdirection == EnumDirection.UP && !enuminteractionresult.a() && blockposition.getY() >= this.minecraftServer.getMaxBuildHeight() - 1 && a(this.player, itemstack)) {
@@ -861,12 +1269,51 @@
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInBlockPlace packetplayinblockplace) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinblockplace, this, this.player.getWorldServer());
2016-11-17 02:41:03 +01:00
+ if (this.player.isFrozen()) return; // CraftBukkit
2020-06-25 02:00:00 +02:00
WorldServer worldserver = this.player.getWorldServer();
2018-07-15 02:00:00 +02:00
EnumHand enumhand = packetplayinblockplace.b();
2016-02-29 22:32:46 +01:00
ItemStack itemstack = this.player.b(enumhand);
2016-02-29 22:32:46 +01:00
this.player.resetIdleTimer();
2016-11-17 02:41:03 +01:00
if (!itemstack.isEmpty()) {
+ // CraftBukkit start
+ // Raytrace to look for 'rogue armswings'
+ float f1 = this.player.pitch;
+ float f2 = this.player.yaw;
2019-12-10 23:00:00 +01:00
+ double d0 = this.player.locX();
+ double d1 = this.player.locY() + (double) this.player.getHeadHeight();
+ double d2 = this.player.locZ();
+ Vec3D vec3d = new Vec3D(d0, d1, d2);
+
+ float f3 = MathHelper.cos(-f2 * 0.017453292F - 3.1415927F);
+ float f4 = MathHelper.sin(-f2 * 0.017453292F - 3.1415927F);
+ float f5 = -MathHelper.cos(-f1 * 0.017453292F);
+ float f6 = MathHelper.sin(-f1 * 0.017453292F);
+ float f7 = f4 * f5;
+ float f8 = f3 * f5;
2016-06-09 03:43:49 +02:00
+ double d3 = player.playerInteractManager.getGameMode()== EnumGamemode.CREATIVE ? 5.0D : 4.5D;
+ Vec3D vec3d1 = vec3d.add((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
2019-04-23 04:00:00 +02:00
+ MovingObjectPosition movingobjectposition = this.player.world.rayTrace(new RayTrace(vec3d, vec3d1, RayTrace.BlockCollisionOption.OUTLINE, RayTrace.FluidCollisionOption.NONE, player));
+
2016-11-17 02:41:03 +01:00
+ boolean cancelled;
2019-04-23 04:00:00 +02:00
+ if (movingobjectposition == null || movingobjectposition.getType() != MovingObjectPosition.EnumMovingObjectType.BLOCK) {
+ org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemstack, enumhand);
+ cancelled = event.useItemInHand() == Event.Result.DENY;
+ } else {
+ if (player.playerInteractManager.firedInteract) {
+ player.playerInteractManager.firedInteract = false;
+ cancelled = player.playerInteractManager.interactResult;
+ } else {
2019-04-23 04:00:00 +02:00
+ MovingObjectPositionBlock movingobjectpositionblock = (MovingObjectPositionBlock) movingobjectposition;
+ org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(player, Action.RIGHT_CLICK_BLOCK, movingobjectpositionblock.getBlockPosition(), movingobjectpositionblock.getDirection(), itemstack, true, enumhand);
+ cancelled = event.useItemInHand() == Event.Result.DENY;
+ }
2016-11-17 02:41:03 +01:00
+ }
+
+ if (cancelled) {
+ this.player.getBukkitEntity().updateInventory(); // SPIGOT-2524
2020-06-25 02:00:00 +02:00
+ return;
+ }
2020-06-25 02:00:00 +02:00
EnumInteractionResult enuminteractionresult = this.player.playerInteractManager.a(this.player, worldserver, itemstack, enumhand);
2016-02-29 22:32:46 +01:00
2020-06-25 02:00:00 +02:00
if (enuminteractionresult.b()) {
@@ -887,7 +1334,7 @@
2019-04-23 04:00:00 +02:00
Entity entity = packetplayinspectate.a(worldserver);
2018-07-15 02:00:00 +02:00
2019-04-23 04:00:00 +02:00
if (entity != null) {
2019-12-10 23:00:00 +01:00
- this.player.a(worldserver, entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch);
+ this.player.a(worldserver, entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.SPECTATE); // CraftBukkit
2019-04-23 04:00:00 +02:00
return;
}
}
@@ -896,7 +1343,12 @@
}
2019-04-23 04:00:00 +02:00
@Override
- public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {}
+ // CraftBukkit start
+ public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
+ PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
+ this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()]));
+ }
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInBoatMove packetplayinboatmove) {
@@ -911,11 +1363,26 @@
2016-02-29 22:32:46 +01:00
2019-04-23 04:00:00 +02:00
@Override
public void a(IChatBaseComponent ichatbasecomponent) {
+ // CraftBukkit start - Rarely it would send a disconnect line twice
+ if (this.processedDisconnect) {
+ return;
+ } else {
+ this.processedDisconnect = true;
+ }
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
PlayerConnection.LOGGER.info("{} lost connection: {}", this.player.getDisplayName().getString(), ichatbasecomponent.getString());
+ // CraftBukkit start - Replace vanilla quit message handling with our own.
+ /*
2019-04-23 04:00:00 +02:00
this.minecraftServer.invalidatePingSample();
2020-06-25 02:00:00 +02:00
this.minecraftServer.getPlayerList().sendMessage((new ChatMessage("multiplayer.player.left", new Object[]{this.player.getScoreboardDisplayName()})).a(EnumChatFormat.YELLOW), ChatMessageType.SYSTEM, SystemUtils.b);
+ */
2015-02-26 23:41:06 +01:00
+
2020-06-25 02:00:00 +02:00
this.player.p();
- this.minecraftServer.getPlayerList().disconnect(this.player);
+ String quitMessage = this.minecraftServer.getPlayerList().disconnect(this.player);
+ if ((quitMessage != null) && (quitMessage.length() > 0)) {
+ this.minecraftServer.getPlayerList().sendMessage(CraftChatMessage.fromString(quitMessage));
+ }
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
if (this.isExemptPlayer()) {
2016-02-29 22:32:46 +01:00
PlayerConnection.LOGGER.info("Stopping singleplayer server as player logged out");
2019-04-23 04:00:00 +02:00
this.minecraftServer.safeShutdown(false);
@@ -941,6 +1408,15 @@
}
}
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start
+ if (packet == null) {
+ return;
+ } else if (packet instanceof PacketPlayOutSpawnPosition) {
+ PacketPlayOutSpawnPosition packet6 = (PacketPlayOutSpawnPosition) packet;
+ this.player.compassTarget = new Location(this.getPlayer().getWorld(), packet6.position.getX(), packet6.position.getY(), packet6.position.getZ());
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
try {
2018-07-15 02:00:00 +02:00
this.networkManager.sendPacket(packet, genericfuturelistener);
2015-02-26 23:41:06 +01:00
} catch (Throwable throwable) {
@@ -957,7 +1433,16 @@
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInHeldItemSlot packetplayinhelditemslot) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinhelditemslot, this, this.player.getWorldServer());
2016-11-17 02:41:03 +01:00
+ if (this.player.isFrozen()) return; // CraftBukkit
2018-07-15 02:00:00 +02:00
if (packetplayinhelditemslot.b() >= 0 && packetplayinhelditemslot.b() < PlayerInventory.getHotbarSize()) {
+ PlayerItemHeldEvent event = new PlayerItemHeldEvent(this.getPlayer(), this.player.inventory.itemInHandIndex, packetplayinhelditemslot.b());
+ this.server.getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ this.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex));
2015-05-05 22:43:47 +02:00
+ this.player.resetIdleTimer();
+ return;
+ }
+ // CraftBukkit end
2020-06-25 02:00:00 +02:00
if (this.player.inventory.itemInHandIndex != packetplayinhelditemslot.b() && this.player.getRaisedHand() == EnumHand.MAIN_HAND) {
this.player.clearActiveItem();
}
@@ -966,13 +1451,24 @@
2015-05-05 22:43:47 +02:00
this.player.resetIdleTimer();
} else {
2018-07-15 02:00:00 +02:00
PlayerConnection.LOGGER.warn("{} tried to set an invalid carried item", this.player.getDisplayName().getString());
+ this.disconnect("Invalid hotbar selection (Hacking?)"); // CraftBukkit
}
}
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInChat packetplayinchat) {
2018-07-15 02:00:00 +02:00
- PlayerConnectionUtils.ensureMainThread(packetplayinchat, this, this.player.getWorldServer());
2019-04-23 04:00:00 +02:00
- if (this.player.getChatFlags() == EnumChatVisibility.HIDDEN) {
+ // CraftBukkit start - async chat
+ // SPIGOT-3638
+ if (this.minecraftServer.isStopped()) {
+ return;
+ }
+
2018-07-15 02:00:00 +02:00
+ boolean isSync = packetplayinchat.b().startsWith("/");
+ if (packetplayinchat.b().startsWith("/")) {
+ PlayerConnectionUtils.ensureMainThread(packetplayinchat, this, this.player.getWorldServer());
+ }
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
+ if (this.player.dead || this.player.getChatFlags() == EnumChatVisibility.HIDDEN) { // CraftBukkit - dead men tell no tales
2020-06-25 02:00:00 +02:00
this.sendPacket(new PacketPlayOutChat((new ChatMessage("chat.cannotSend")).a(EnumChatFormat.RED), ChatMessageType.SYSTEM, SystemUtils.b));
2018-07-15 02:00:00 +02:00
} else {
this.player.resetIdleTimer();
@@ -980,41 +1476,254 @@
for (int i = 0; i < s.length(); ++i) {
if (!SharedConstants.isAllowedChatCharacter(s.charAt(i))) {
2020-06-25 02:00:00 +02:00
- this.disconnect(new ChatMessage("multiplayer.disconnect.illegal_characters"));
+ // CraftBukkit start - threadsafety
+ if (!isSync) {
+ Waitable waitable = new Waitable() {
+ @Override
+ protected Object evaluate() {
2020-06-25 02:00:00 +02:00
+ PlayerConnection.this.disconnect(new ChatMessage("multiplayer.disconnect.illegal_characters"));
+ return null;
+ }
+ };
+
+ this.minecraftServer.processQueue.add(waitable);
+
+ try {
+ waitable.get();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
2020-06-25 02:00:00 +02:00
+ this.disconnect(new ChatMessage("multiplayer.disconnect.illegal_characters"));
+ }
+ // CraftBukkit end
return;
}
}
- if (s.startsWith("/")) {
- this.handleCommand(s);
+ // CraftBukkit start
+ if (isSync) {
+ try {
+ this.minecraftServer.server.playerCommandState = true;
+ this.handleCommand(s);
+ } finally {
+ this.minecraftServer.server.playerCommandState = false;
+ }
+ } else if (s.isEmpty()) {
2016-02-29 22:32:46 +01:00
+ LOGGER.warn(this.player.getName() + " tried to send an empty message");
+ } else if (getPlayer().isConversing()) {
+ final String conversationInput = s;
+ this.minecraftServer.processQueue.add(new Runnable() {
+ @Override
+ public void run() {
+ getPlayer().acceptConversationInput(conversationInput);
+ }
+ });
2019-04-23 04:00:00 +02:00
+ } else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) { // Re-add "Command Only" flag check
2020-06-25 02:00:00 +02:00
+ this.sendPacket(new PacketPlayOutChat((new ChatMessage("chat.cannotSend")).a(EnumChatFormat.RED), ChatMessageType.SYSTEM, SystemUtils.b));
+ } else if (true) {
+ this.chat(s, true);
+ // CraftBukkit end - the below is for reference. :)
} else {
2019-05-27 22:30:00 +02:00
ChatMessage chatmessage = new ChatMessage("chat.type.text", new Object[]{this.player.getScoreboardDisplayName(), s});
2020-06-25 02:00:00 +02:00
this.minecraftServer.getPlayerList().sendMessage(chatmessage, ChatMessageType.CHAT, this.player.getUniqueID());
}
- this.chatThrottle += 20;
- if (this.chatThrottle > 200 && !this.minecraftServer.getPlayerList().isOp(this.player.getProfile())) {
2020-06-25 02:00:00 +02:00
- this.disconnect(new ChatMessage("disconnect.spam"));
+ // CraftBukkit start - replaced with thread safe throttle
+ // this.chatThrottle += 20;
+ if (chatSpamField.addAndGet(this, 20) > 200 && !this.minecraftServer.getPlayerList().isOp(this.player.getProfile())) {
+ if (!isSync) {
+ Waitable waitable = new Waitable() {
+ @Override
+ protected Object evaluate() {
2020-06-25 02:00:00 +02:00
+ PlayerConnection.this.disconnect(new ChatMessage("disconnect.spam"));
+ return null;
+ }
+ };
+
2014-11-29 00:06:03 +01:00
+ this.minecraftServer.processQueue.add(waitable);
+
+ try {
+ waitable.get();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
2020-06-25 02:00:00 +02:00
+ this.disconnect(new ChatMessage("disconnect.spam"));
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
}
}
}
+ // CraftBukkit start - add method
+ public void chat(String s, boolean async) {
2019-04-23 04:00:00 +02:00
+ if (s.isEmpty() || this.player.getChatFlags() == EnumChatVisibility.HIDDEN) {
+ return;
+ }
+
+ if (!async && s.startsWith("/")) {
+ this.handleCommand(s);
2019-04-23 04:00:00 +02:00
+ } else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) {
+ // Do nothing, this is coming from a plugin
+ } else {
+ Player player = this.getPlayer();
2016-02-29 22:32:46 +01:00
+ AsyncPlayerChatEvent event = new AsyncPlayerChatEvent(async, player, s, new LazyPlayerSet(minecraftServer));
+ this.server.getPluginManager().callEvent(event);
+
+ if (PlayerChatEvent.getHandlerList().getRegisteredListeners().length != 0) {
+ // Evil plugins still listening to deprecated event
+ final PlayerChatEvent queueEvent = new PlayerChatEvent(player, event.getMessage(), event.getFormat(), event.getRecipients());
+ queueEvent.setCancelled(event.isCancelled());
+ Waitable waitable = new Waitable() {
+ @Override
+ protected Object evaluate() {
+ org.bukkit.Bukkit.getPluginManager().callEvent(queueEvent);
+
+ if (queueEvent.isCancelled()) {
+ return null;
+ }
+
+ String message = String.format(queueEvent.getFormat(), queueEvent.getPlayer().getDisplayName(), queueEvent.getMessage());
+ PlayerConnection.this.minecraftServer.console.sendMessage(message);
+ if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
+ for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) {
+ ((EntityPlayer) player).sendMessage(CraftChatMessage.fromString(message));
+ }
+ } else {
+ for (Player player : queueEvent.getRecipients()) {
+ player.sendMessage(message);
+ }
+ }
+ return null;
+ }};
+ if (async) {
+ minecraftServer.processQueue.add(waitable);
+ } else {
+ waitable.run();
+ }
+ try {
+ waitable.get();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt(); // This is proper habit for java. If we aren't handling it, pass it on!
+ } catch (ExecutionException e) {
+ throw new RuntimeException("Exception processing chat event", e.getCause());
+ }
+ } else {
+ if (event.isCancelled()) {
+ return;
+ }
2015-02-26 23:41:06 +01:00
+
+ s = String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage());
+ minecraftServer.console.sendMessage(s);
+ if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
+ for (Object recipient : minecraftServer.getPlayerList().players) {
+ ((EntityPlayer) recipient).sendMessage(CraftChatMessage.fromString(s));
+ }
+ } else {
+ for (Player recipient : event.getRecipients()) {
+ recipient.sendMessage(s);
+ }
+ }
+ }
2015-02-26 23:41:06 +01:00
+ }
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2017-05-14 04:00:00 +02:00
private void handleCommand(String s) {
2018-07-15 02:00:00 +02:00
- this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
+ // CraftBukkit start - whole method
2016-02-29 22:32:46 +01:00
+ this.LOGGER.info(this.player.getName() + " issued server command: " + s);
+
+ CraftPlayer player = this.getPlayer();
+
2016-02-29 22:32:46 +01:00
+ PlayerCommandPreprocessEvent event = new PlayerCommandPreprocessEvent(player, s, new LazyPlayerSet(minecraftServer));
+ this.server.getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return;
+ }
+
+ try {
+ if (this.server.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) {
+ return;
+ }
+ } catch (org.bukkit.command.CommandException ex) {
+ player.sendMessage(org.bukkit.ChatColor.RED + "An internal error occurred while attempting to perform this command");
+ java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
+ return;
+ }
2018-07-15 02:00:00 +02:00
+ // this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
+ // CraftBukkit end
}
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInArmAnimation packetplayinarmanimation) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinarmanimation, this, this.player.getWorldServer());
2016-11-17 02:41:03 +01:00
+ if (this.player.isFrozen()) return; // CraftBukkit
2015-05-05 22:43:47 +02:00
this.player.resetIdleTimer();
+ // CraftBukkit start - Raytrace to look for 'rogue armswings'
2014-11-30 13:10:30 +01:00
+ float f1 = this.player.pitch;
+ float f2 = this.player.yaw;
2019-12-10 23:00:00 +01:00
+ double d0 = this.player.locX();
+ double d1 = this.player.locY() + (double) this.player.getHeadHeight();
+ double d2 = this.player.locZ();
+ Vec3D vec3d = new Vec3D(d0, d1, d2);
+
+ float f3 = MathHelper.cos(-f2 * 0.017453292F - 3.1415927F);
+ float f4 = MathHelper.sin(-f2 * 0.017453292F - 3.1415927F);
+ float f5 = -MathHelper.cos(-f1 * 0.017453292F);
+ float f6 = MathHelper.sin(-f1 * 0.017453292F);
+ float f7 = f4 * f5;
+ float f8 = f3 * f5;
2016-06-09 03:43:49 +02:00
+ double d3 = player.playerInteractManager.getGameMode()== EnumGamemode.CREATIVE ? 5.0D : 4.5D;
+ Vec3D vec3d1 = vec3d.add((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
2019-04-23 04:00:00 +02:00
+ MovingObjectPosition movingobjectposition = this.player.world.rayTrace(new RayTrace(vec3d, vec3d1, RayTrace.BlockCollisionOption.OUTLINE, RayTrace.FluidCollisionOption.NONE, player));
+
2019-04-23 04:00:00 +02:00
+ if (movingobjectposition == null || movingobjectposition.getType() != MovingObjectPosition.EnumMovingObjectType.BLOCK) {
+ CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_AIR, this.player.inventory.getItemInHand(), EnumHand.MAIN_HAND);
+ }
+
+ // Arm swing animation
+ PlayerAnimationEvent event = new PlayerAnimationEvent(this.getPlayer());
+ this.server.getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) return;
+ // CraftBukkit end
2020-06-25 02:00:00 +02:00
this.player.swingHand(packetplayinarmanimation.b());
}
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInEntityAction packetplayinentityaction) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinentityaction, this, this.player.getWorldServer());
+ // CraftBukkit start
+ if (this.player.dead) return;
2018-07-15 02:00:00 +02:00
+ switch (packetplayinentityaction.c()) {
2019-12-10 23:00:00 +01:00
+ case PRESS_SHIFT_KEY:
+ case RELEASE_SHIFT_KEY:
+ PlayerToggleSneakEvent event = new PlayerToggleSneakEvent(this.getPlayer(), packetplayinentityaction.c() == PacketPlayInEntityAction.EnumPlayerAction.PRESS_SHIFT_KEY);
+ this.server.getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return;
+ }
+ break;
+ case START_SPRINTING:
2015-02-26 23:41:06 +01:00
+ case STOP_SPRINTING:
2018-07-15 02:00:00 +02:00
+ PlayerToggleSprintEvent e2 = new PlayerToggleSprintEvent(this.getPlayer(), packetplayinentityaction.c() == PacketPlayInEntityAction.EnumPlayerAction.START_SPRINTING);
+ this.server.getPluginManager().callEvent(e2);
+
+ if (e2.isCancelled()) {
+ return;
+ }
+ break;
+ }
2015-02-26 23:41:06 +01:00
+ // CraftBukkit end
2015-05-05 22:43:47 +02:00
this.player.resetIdleTimer();
2016-02-29 22:32:46 +01:00
IJumpable ijumpable;
@@ -1072,6 +1781,7 @@
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInUseEntity packetplayinuseentity) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.getWorldServer());
2016-11-17 02:41:03 +01:00
+ if (this.player.isFrozen()) return; // CraftBukkit
2020-06-25 02:00:00 +02:00
WorldServer worldserver = this.player.getWorldServer();
Entity entity = packetplayinuseentity.a((World) worldserver);
@@ -1084,18 +1794,72 @@
2020-06-25 02:00:00 +02:00
EnumHand enumhand = packetplayinuseentity.c();
Optional<EnumInteractionResult> optional = Optional.empty();
2016-02-29 22:32:46 +01:00
2018-07-15 02:00:00 +02:00
+ ItemStack itemInHand = this.player.b(packetplayinuseentity.c() == null ? EnumHand.MAIN_HAND : packetplayinuseentity.c()); // CraftBukkit
2015-02-26 23:41:06 +01:00
+
2018-07-15 02:00:00 +02:00
+ if (packetplayinuseentity.b() == PacketPlayInUseEntity.EnumEntityUseAction.INTERACT
+ || packetplayinuseentity.b() == PacketPlayInUseEntity.EnumEntityUseAction.INTERACT_AT) {
+ // CraftBukkit start
+ boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient;
+ Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem();
+ PlayerInteractEntityEvent event;
2018-07-15 02:00:00 +02:00
+ if (packetplayinuseentity.b() == PacketPlayInUseEntity.EnumEntityUseAction.INTERACT) {
+ event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
+ } else {
2018-07-15 02:00:00 +02:00
+ Vec3D target = packetplayinuseentity.d();
+ event = new PlayerInteractAtEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), new org.bukkit.util.Vector(target.x, target.y, target.z), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
+ }
+ this.server.getPluginManager().callEvent(event);
+
+ // Fish bucket - SPIGOT-4048
+ if ((entity instanceof EntityFish && origItem != null && origItem.getItem() == Items.WATER_BUCKET) && (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem)) {
+ this.sendPacket(new PacketPlayOutSpawnEntityLiving((EntityFish) entity));
+ this.player.updateInventory(this.player.activeContainer);
+ }
+
+ if (triggerLeashUpdate && (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem)) {
+ // Refresh the current leash state
2016-02-29 22:32:46 +01:00
+ this.sendPacket(new PacketPlayOutAttachEntity(entity, ((EntityInsentient) entity).getLeashHolder()));
+ }
+
+ if (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem) {
+ // Refresh the current entity metadata
+ this.sendPacket(new PacketPlayOutEntityMetadata(entity.getId(), entity.datawatcher, true));
+ }
+
+ if (event.isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
+ }
2016-02-29 22:32:46 +01:00
+
2018-07-15 02:00:00 +02:00
if (packetplayinuseentity.b() == PacketPlayInUseEntity.EnumEntityUseAction.INTERACT) {
2020-06-25 02:00:00 +02:00
optional = Optional.of(this.player.a(entity, enumhand));
+ // CraftBukkit start
2016-11-17 02:41:03 +01:00
+ if (!itemInHand.isEmpty() && itemInHand.getCount() <= -1) {
+ this.player.updateInventory(this.player.activeContainer);
+ }
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
} else if (packetplayinuseentity.b() == PacketPlayInUseEntity.EnumEntityUseAction.INTERACT_AT) {
2020-06-25 02:00:00 +02:00
optional = Optional.of(entity.a((EntityHuman) this.player, packetplayinuseentity.d(), enumhand));
+ // CraftBukkit start
2016-11-17 02:41:03 +01:00
+ if (!itemInHand.isEmpty() && itemInHand.getCount() <= -1) {
+ this.player.updateInventory(this.player.activeContainer);
+ }
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
} else if (packetplayinuseentity.b() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK) {
- if (entity instanceof EntityItem || entity instanceof EntityExperienceOrb || entity instanceof EntityArrow || entity == this.player) {
2015-05-05 22:43:47 +02:00
+ if (entity instanceof EntityItem || entity instanceof EntityExperienceOrb || entity instanceof EntityArrow || (entity == this.player && !player.isSpectator())) { // CraftBukkit
2020-06-25 02:00:00 +02:00
this.disconnect(new ChatMessage("multiplayer.disconnect.invalid_entity_attacked"));
PlayerConnection.LOGGER.warn("Player {} tried to attack an invalid entity", this.player.getDisplayName().getString());
return;
}
this.player.attack(entity);
2015-02-26 23:41:06 +01:00
+
+ // CraftBukkit start
2016-11-17 02:41:03 +01:00
+ if (!itemInHand.isEmpty() && itemInHand.getCount() <= -1) {
+ this.player.updateInventory(this.player.activeContainer);
+ }
+ // CraftBukkit end
}
2020-06-25 02:00:00 +02:00
if (optional.isPresent() && ((EnumInteractionResult) optional.get()).a()) {
@@ -1142,15 +1906,21 @@
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInCloseWindow packetplayinclosewindow) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinclosewindow, this, this.player.getWorldServer());
2015-02-26 23:41:06 +01:00
+
2016-11-17 02:41:03 +01:00
+ if (this.player.isFrozen()) return; // CraftBukkit
+ CraftEventFactory.handleInventoryCloseEvent(this.player); // CraftBukkit
2015-02-26 23:41:06 +01:00
+
2020-06-25 02:00:00 +02:00
this.player.o();
}
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInWindowClick packetplayinwindowclick) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinwindowclick, this, this.player.getWorldServer());
2016-11-17 02:41:03 +01:00
+ if (this.player.isFrozen()) return; // CraftBukkit
2015-05-05 22:43:47 +02:00
this.player.resetIdleTimer();
2018-07-15 02:00:00 +02:00
- if (this.player.activeContainer.windowId == packetplayinwindowclick.b() && this.player.activeContainer.c(this.player)) {
2015-05-05 22:43:47 +02:00
- if (this.player.isSpectator()) {
2018-07-15 02:00:00 +02:00
+ if (this.player.activeContainer.windowId == packetplayinwindowclick.b() && this.player.activeContainer.c(this.player) && this.player.activeContainer.canUse(this.player)) { // CraftBukkit
2015-05-05 22:43:47 +02:00
+ boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if
2016-02-29 22:32:46 +01:00
+ if (false/*this.player.isSpectator()*/) { // CraftBukkit
2018-12-25 22:00:00 +01:00
NonNullList<ItemStack> nonnulllist = NonNullList.a();
2017-09-18 12:00:00 +02:00
for (int i = 0; i < this.player.activeContainer.slots.size(); ++i) {
@@ -1159,8 +1929,274 @@
2016-11-17 02:41:03 +01:00
this.player.a(this.player.activeContainer, nonnulllist);
} else {
2018-07-15 02:00:00 +02:00
- ItemStack itemstack = this.player.activeContainer.a(packetplayinwindowclick.c(), packetplayinwindowclick.d(), packetplayinwindowclick.g(), this.player);
+ // CraftBukkit start - Call InventoryClickEvent
2018-07-15 02:00:00 +02:00
+ if (packetplayinwindowclick.c() < -1 && packetplayinwindowclick.c() != -999) {
+ return;
+ }
2019-05-27 22:30:00 +02:00
+
+ InventoryView inventory = this.player.activeContainer.getBukkitView();
2018-12-26 00:40:14 +01:00
+ SlotType type = inventory.getSlotType(packetplayinwindowclick.c());
+
2016-02-29 22:32:46 +01:00
+ InventoryClickEvent event;
+ ClickType click = ClickType.UNKNOWN;
+ InventoryAction action = InventoryAction.UNKNOWN;
+
2020-06-25 02:00:00 +02:00
+ ItemStack itemstack = ItemStack.b;
+
2018-07-15 02:00:00 +02:00
+ switch (packetplayinwindowclick.g()) {
2016-02-29 22:32:46 +01:00
+ case PICKUP:
2018-07-15 02:00:00 +02:00
+ if (packetplayinwindowclick.d() == 0) {
2016-02-29 22:32:46 +01:00
+ click = ClickType.LEFT;
2018-07-15 02:00:00 +02:00
+ } else if (packetplayinwindowclick.d() == 1) {
2016-02-29 22:32:46 +01:00
+ click = ClickType.RIGHT;
+ }
2018-07-15 02:00:00 +02:00
+ if (packetplayinwindowclick.d() == 0 || packetplayinwindowclick.d() == 1) {
2016-02-29 22:32:46 +01:00
+ action = InventoryAction.NOTHING; // Don't want to repeat ourselves
2018-07-15 02:00:00 +02:00
+ if (packetplayinwindowclick.c() == -999) {
+ if (!player.inventory.getCarried().isEmpty()) {
2018-07-15 02:00:00 +02:00
+ action = packetplayinwindowclick.d() == 0 ? InventoryAction.DROP_ALL_CURSOR : InventoryAction.DROP_ONE_CURSOR;
2016-02-29 22:32:46 +01:00
+ }
2018-07-15 02:00:00 +02:00
+ } else if (packetplayinwindowclick.c() < 0) {
+ action = InventoryAction.NOTHING;
2016-02-29 22:32:46 +01:00
+ } else {
2018-07-15 02:00:00 +02:00
+ Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.c());
2016-02-29 22:32:46 +01:00
+ if (slot != null) {
+ ItemStack clickedItem = slot.getItem();
+ ItemStack cursor = player.inventory.getCarried();
+ if (clickedItem.isEmpty()) {
+ if (!cursor.isEmpty()) {
2018-07-15 02:00:00 +02:00
+ action = packetplayinwindowclick.d() == 0 ? InventoryAction.PLACE_ALL : InventoryAction.PLACE_ONE;
+ }
2016-02-29 22:32:46 +01:00
+ } else if (slot.isAllowed(player)) {
+ if (cursor.isEmpty()) {
2018-07-15 02:00:00 +02:00
+ action = packetplayinwindowclick.d() == 0 ? InventoryAction.PICKUP_ALL : InventoryAction.PICKUP_HALF;
2016-02-29 22:32:46 +01:00
+ } else if (slot.isAllowed(cursor)) {
+ if (clickedItem.doMaterialsMatch(cursor) && ItemStack.equals(clickedItem, cursor)) {
2018-07-15 02:00:00 +02:00
+ int toPlace = packetplayinwindowclick.d() == 0 ? cursor.getCount() : 1;
2016-11-17 02:41:03 +01:00
+ toPlace = Math.min(toPlace, clickedItem.getMaxStackSize() - clickedItem.getCount());
+ toPlace = Math.min(toPlace, slot.inventory.getMaxStackSize() - clickedItem.getCount());
2016-02-29 22:32:46 +01:00
+ if (toPlace == 1) {
+ action = InventoryAction.PLACE_ONE;
2016-11-17 02:41:03 +01:00
+ } else if (toPlace == cursor.getCount()) {
2016-02-29 22:32:46 +01:00
+ action = InventoryAction.PLACE_ALL;
+ } else if (toPlace < 0) {
+ action = toPlace != -1 ? InventoryAction.PICKUP_SOME : InventoryAction.PICKUP_ONE; // this happens with oversized stacks
+ } else if (toPlace != 0) {
+ action = InventoryAction.PLACE_SOME;
+ }
2016-11-17 02:41:03 +01:00
+ } else if (cursor.getCount() <= slot.getMaxStackSize()) {
2016-02-29 22:32:46 +01:00
+ action = InventoryAction.SWAP_WITH_CURSOR;
+ }
2018-07-15 02:00:00 +02:00
+ } else if (cursor.getItem() == clickedItem.getItem() && ItemStack.equals(cursor, clickedItem)) {
2016-11-17 02:41:03 +01:00
+ if (clickedItem.getCount() >= 0) {
+ if (clickedItem.getCount() + cursor.getCount() <= cursor.getMaxStackSize()) {
2016-02-29 22:32:46 +01:00
+ // As of 1.5, this is result slots only
+ action = InventoryAction.PICKUP_ALL;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
2016-02-29 22:32:46 +01:00
+ break;
+ // TODO check on updates
+ case QUICK_MOVE:
2018-07-15 02:00:00 +02:00
+ if (packetplayinwindowclick.d() == 0) {
2016-02-29 22:32:46 +01:00
+ click = ClickType.SHIFT_LEFT;
2018-07-15 02:00:00 +02:00
+ } else if (packetplayinwindowclick.d() == 1) {
2016-02-29 22:32:46 +01:00
+ click = ClickType.SHIFT_RIGHT;
+ }
2018-07-15 02:00:00 +02:00
+ if (packetplayinwindowclick.d() == 0 || packetplayinwindowclick.d() == 1) {
+ if (packetplayinwindowclick.c() < 0) {
+ action = InventoryAction.NOTHING;
2016-02-29 22:32:46 +01:00
+ } else {
2018-07-15 02:00:00 +02:00
+ Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.c());
2016-02-29 22:32:46 +01:00
+ if (slot != null && slot.isAllowed(this.player) && slot.hasItem()) {
+ action = InventoryAction.MOVE_TO_OTHER_INVENTORY;
+ } else {
+ action = InventoryAction.NOTHING;
+ }
+ }
+ }
2016-02-29 22:32:46 +01:00
+ break;
+ case SWAP:
+ if ((packetplayinwindowclick.d() >= 0 && packetplayinwindowclick.d() < 9) || packetplayinwindowclick.d() == 40) {
+ click = (packetplayinwindowclick.d() == 40) ? ClickType.SWAP_OFFHAND : ClickType.NUMBER_KEY;
2018-07-15 02:00:00 +02:00
+ Slot clickedSlot = this.player.activeContainer.getSlot(packetplayinwindowclick.c());
2016-02-29 22:32:46 +01:00
+ if (clickedSlot.isAllowed(player)) {
2018-07-15 02:00:00 +02:00
+ ItemStack hotbar = this.player.inventory.getItem(packetplayinwindowclick.d());
+ boolean canCleanSwap = hotbar.isEmpty() || (clickedSlot.inventory == player.inventory && clickedSlot.isAllowed(hotbar)); // the slot will accept the hotbar item
2016-02-29 22:32:46 +01:00
+ if (clickedSlot.hasItem()) {
+ if (canCleanSwap) {
+ action = InventoryAction.HOTBAR_SWAP;
+ } else {
+ action = InventoryAction.HOTBAR_MOVE_AND_READD;
+ }
+ } else if (!clickedSlot.hasItem() && !hotbar.isEmpty() && clickedSlot.isAllowed(hotbar)) {
2016-02-29 22:32:46 +01:00
+ action = InventoryAction.HOTBAR_SWAP;
+ } else {
+ action = InventoryAction.NOTHING;
+ }
+ } else {
+ action = InventoryAction.NOTHING;
+ }
+ }
2016-02-29 22:32:46 +01:00
+ break;
+ case CLONE:
2018-07-15 02:00:00 +02:00
+ if (packetplayinwindowclick.d() == 2) {
2016-02-29 22:32:46 +01:00
+ click = ClickType.MIDDLE;
+ if (packetplayinwindowclick.c() < 0) {
+ action = InventoryAction.NOTHING;
2016-02-29 22:32:46 +01:00
+ } else {
2018-07-15 02:00:00 +02:00
+ Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.c());
+ if (slot != null && slot.hasItem() && player.abilities.canInstantlyBuild && player.inventory.getCarried().isEmpty()) {
2016-02-29 22:32:46 +01:00
+ action = InventoryAction.CLONE_STACK;
+ } else {
+ action = InventoryAction.NOTHING;
+ }
+ }
2016-02-29 22:32:46 +01:00
+ } else {
+ click = ClickType.UNKNOWN;
+ action = InventoryAction.UNKNOWN;
+ }
2016-02-29 22:32:46 +01:00
+ break;
+ case THROW:
2018-07-15 02:00:00 +02:00
+ if (packetplayinwindowclick.c() >= 0) {
+ if (packetplayinwindowclick.d() == 0) {
2016-02-29 22:32:46 +01:00
+ click = ClickType.DROP;
2018-07-15 02:00:00 +02:00
+ Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.c());
+ if (slot != null && slot.hasItem() && slot.isAllowed(player) && !slot.getItem().isEmpty() && slot.getItem().getItem() != Item.getItemOf(Blocks.AIR)) {
2016-02-29 22:32:46 +01:00
+ action = InventoryAction.DROP_ONE_SLOT;
+ } else {
+ action = InventoryAction.NOTHING;
+ }
2018-07-15 02:00:00 +02:00
+ } else if (packetplayinwindowclick.d() == 1) {
2016-02-29 22:32:46 +01:00
+ click = ClickType.CONTROL_DROP;
2018-07-15 02:00:00 +02:00
+ Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.c());
+ if (slot != null && slot.hasItem() && slot.isAllowed(player) && !slot.getItem().isEmpty() && slot.getItem().getItem() != Item.getItemOf(Blocks.AIR)) {
2016-02-29 22:32:46 +01:00
+ action = InventoryAction.DROP_ALL_SLOT;
+ } else {
+ action = InventoryAction.NOTHING;
+ }
+ }
2016-02-29 22:32:46 +01:00
+ } else {
+ // Sane default (because this happens when they are holding nothing. Don't ask why.)
+ click = ClickType.LEFT;
2018-07-15 02:00:00 +02:00
+ if (packetplayinwindowclick.d() == 1) {
2016-02-29 22:32:46 +01:00
+ click = ClickType.RIGHT;
+ }
2016-02-29 22:32:46 +01:00
+ action = InventoryAction.NOTHING;
+ }
2016-02-29 22:32:46 +01:00
+ break;
+ case QUICK_CRAFT:
2018-07-15 02:00:00 +02:00
+ itemstack = this.player.activeContainer.a(packetplayinwindowclick.c(), packetplayinwindowclick.d(), packetplayinwindowclick.g(), this.player);
2016-02-29 22:32:46 +01:00
+ break;
+ case PICKUP_ALL:
+ click = ClickType.DOUBLE_CLICK;
+ action = InventoryAction.NOTHING;
2018-07-15 02:00:00 +02:00
+ if (packetplayinwindowclick.c() >= 0 && !this.player.inventory.getCarried().isEmpty()) {
2016-02-29 22:32:46 +01:00
+ ItemStack cursor = this.player.inventory.getCarried();
+ action = InventoryAction.NOTHING;
+ // Quick check for if we have any of the item
2018-07-15 02:00:00 +02:00
+ if (inventory.getTopInventory().contains(CraftMagicNumbers.getMaterial(cursor.getItem())) || inventory.getBottomInventory().contains(CraftMagicNumbers.getMaterial(cursor.getItem()))) {
2016-02-29 22:32:46 +01:00
+ action = InventoryAction.COLLECT_TO_CURSOR;
+ }
+ }
2016-02-29 22:32:46 +01:00
+ break;
+ default:
+ break;
+ }
2018-07-15 02:00:00 +02:00
+
+ if (packetplayinwindowclick.g() != InventoryClickType.QUICK_CRAFT) {
+ if (click == ClickType.NUMBER_KEY) {
2018-07-15 02:00:00 +02:00
+ event = new InventoryClickEvent(inventory, type, packetplayinwindowclick.c(), click, action, packetplayinwindowclick.d());
+ } else {
2018-07-15 02:00:00 +02:00
+ event = new InventoryClickEvent(inventory, type, packetplayinwindowclick.c(), click, action);
+ }
+
+ org.bukkit.inventory.Inventory top = inventory.getTopInventory();
2018-07-15 02:00:00 +02:00
+ if (packetplayinwindowclick.c() == 0 && top instanceof CraftingInventory) {
+ org.bukkit.inventory.Recipe recipe = ((CraftingInventory) top).getRecipe();
+ if (recipe != null) {
+ if (click == ClickType.NUMBER_KEY) {
2018-07-15 02:00:00 +02:00
+ event = new CraftItemEvent(recipe, inventory, type, packetplayinwindowclick.c(), click, action, packetplayinwindowclick.d());
+ } else {
2018-07-15 02:00:00 +02:00
+ event = new CraftItemEvent(recipe, inventory, type, packetplayinwindowclick.c(), click, action);
+ }
+ }
+ }
2020-06-25 02:00:00 +02:00
+
+ event.setCancelled(cancelled);
+ Container oldContainer = this.player.activeContainer; // SPIGOT-1224
+ server.getPluginManager().callEvent(event);
+ if (this.player.activeContainer != oldContainer) {
+ return;
+ }
2020-06-25 02:00:00 +02:00
+ switch (event.getResult()) {
+ case ALLOW:
+ case DEFAULT:
2018-07-15 02:00:00 +02:00
+ itemstack = this.player.activeContainer.a(packetplayinwindowclick.c(), packetplayinwindowclick.d(), packetplayinwindowclick.g(), this.player);
+ break;
+ case DENY:
+ /* Needs enum constructor in InventoryAction
+ if (action.modifiesOtherSlots()) {
+
+ } else {
+ if (action.modifiesCursor()) {
+ this.player.playerConnection.sendPacket(new Packet103SetSlot(-1, -1, this.player.inventory.getCarried()));
+ }
+ if (action.modifiesClicked()) {
+ this.player.playerConnection.sendPacket(new Packet103SetSlot(this.player.activeContainer.windowId, packet102windowclick.slot, this.player.activeContainer.getSlot(packet102windowclick.slot).getItem()));
+ }
+ }*/
+ switch (action) {
+ // Modified other slots
+ case PICKUP_ALL:
+ case MOVE_TO_OTHER_INVENTORY:
+ case HOTBAR_MOVE_AND_READD:
+ case HOTBAR_SWAP:
+ case COLLECT_TO_CURSOR:
+ case UNKNOWN:
+ this.player.updateInventory(this.player.activeContainer);
+ break;
+ // Modified cursor and clicked
+ case PICKUP_SOME:
+ case PICKUP_HALF:
+ case PICKUP_ONE:
+ case PLACE_ALL:
+ case PLACE_SOME:
+ case PLACE_ONE:
+ case SWAP_WITH_CURSOR:
+ this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-1, -1, this.player.inventory.getCarried()));
+ this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(this.player.activeContainer.windowId, packetplayinwindowclick.c(), this.player.activeContainer.getSlot(packetplayinwindowclick.c()).getItem()));
+ break;
+ // Modified clicked only
+ case DROP_ALL_SLOT:
+ case DROP_ONE_SLOT:
+ this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(this.player.activeContainer.windowId, packetplayinwindowclick.c(), this.player.activeContainer.getSlot(packetplayinwindowclick.c()).getItem()));
+ break;
+ // Modified cursor only
+ case DROP_ALL_CURSOR:
+ case DROP_ONE_CURSOR:
+ case CLONE_STACK:
+ this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-1, -1, this.player.inventory.getCarried()));
+ break;
+ // Nothing
+ case NOTHING:
+ break;
+ }
+ return;
+ }
+
+ if (event instanceof CraftItemEvent) {
+ // Need to update the inventory on crafting to
+ // correctly support custom recipes
+ player.updateInventory(player.activeContainer);
+ }
+ }
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
if (ItemStack.matches(packetplayinwindowclick.f(), itemstack)) {
this.player.playerConnection.sendPacket(new PacketPlayOutTransaction(packetplayinwindowclick.b(), packetplayinwindowclick.e(), true));
2019-04-23 04:00:00 +02:00
this.player.e = true;
@@ -1200,6 +2236,7 @@
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInEnchantItem packetplayinenchantitem) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinenchantitem, this, this.player.getWorldServer());
2016-11-17 02:41:03 +01:00
+ if (this.player.isFrozen()) return; // CraftBukkit
this.player.resetIdleTimer();
2018-07-15 02:00:00 +02:00
if (this.player.activeContainer.windowId == packetplayinenchantitem.b() && this.player.activeContainer.c(this.player) && !this.player.isSpectator()) {
2019-04-23 04:00:00 +02:00
this.player.activeContainer.a((EntityHuman) this.player, packetplayinenchantitem.c());
@@ -1232,6 +2269,43 @@
2018-07-15 02:00:00 +02:00
boolean flag1 = packetplayinsetcreativeslot.b() >= 1 && packetplayinsetcreativeslot.b() <= 45;
boolean flag2 = itemstack.isEmpty() || itemstack.getDamage() >= 0 && itemstack.getCount() <= 64 && !itemstack.isEmpty();
+ if (flag || (flag1 && !ItemStack.matches(this.player.defaultContainer.getSlot(packetplayinsetcreativeslot.b()).getItem(), packetplayinsetcreativeslot.getItemStack()))) { // Insist on valid slot
2016-11-17 02:41:03 +01:00
+ // CraftBukkit start - Call click event
+ InventoryView inventory = this.player.defaultContainer.getBukkitView();
+ org.bukkit.inventory.ItemStack item = CraftItemStack.asBukkitCopy(packetplayinsetcreativeslot.getItemStack());
+
+ SlotType type = SlotType.QUICKBAR;
+ if (flag) {
+ type = SlotType.OUTSIDE;
2018-07-15 02:00:00 +02:00
+ } else if (packetplayinsetcreativeslot.b() < 36) {
+ if (packetplayinsetcreativeslot.b() >= 5 && packetplayinsetcreativeslot.b() < 9) {
+ type = SlotType.ARMOR;
+ } else {
+ type = SlotType.CONTAINER;
+ }
+ }
2018-07-15 02:00:00 +02:00
+ InventoryCreativeEvent event = new InventoryCreativeEvent(inventory, type, flag ? -999 : packetplayinsetcreativeslot.b(), item);
+ server.getPluginManager().callEvent(event);
+
+ itemstack = CraftItemStack.asNMSCopy(event.getCursor());
+
+ switch (event.getResult()) {
+ case ALLOW:
+ // Plugin cleared the id / stacksize checks
2016-11-17 02:41:03 +01:00
+ flag2 = true;
+ break;
+ case DEFAULT:
+ break;
+ case DENY:
+ // Reset the slot
2018-07-15 02:00:00 +02:00
+ if (packetplayinsetcreativeslot.b() >= 0) {
+ this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(this.player.defaultContainer.windowId, packetplayinsetcreativeslot.b(), this.player.defaultContainer.getSlot(packetplayinsetcreativeslot.b()).getItem()));
2020-06-25 02:00:00 +02:00
+ this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-1, -1, ItemStack.b));
+ }
+ return;
+ }
+ }
+ // CraftBukkit end
2016-11-17 02:41:03 +01:00
if (flag1 && flag2) {
if (itemstack.isEmpty()) {
@@ -1253,6 +2327,7 @@
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInTransaction packetplayintransaction) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayintransaction, this, this.player.getWorldServer());
2016-11-17 02:41:03 +01:00
+ if (this.player.isFrozen()) return; // CraftBukkit
2019-04-23 04:00:00 +02:00
int i = this.player.activeContainer.windowId;
2019-04-23 04:00:00 +02:00
if (i == packetplayintransaction.b() && this.k.getOrDefault(i, (short) (packetplayintransaction.c() + 1)) == packetplayintransaction.c() && !this.player.activeContainer.c(this.player) && !this.player.isSpectator()) {
@@ -1264,6 +2339,7 @@
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInUpdateSign packetplayinupdatesign) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinupdatesign, this, this.player.getWorldServer());
2016-11-17 02:41:03 +01:00
+ if (this.player.isFrozen()) return; // CraftBukkit
2015-05-05 22:43:47 +02:00
this.player.resetIdleTimer();
2020-06-25 02:00:00 +02:00
WorldServer worldserver = this.player.getWorldServer();
2018-07-15 02:00:00 +02:00
BlockPosition blockposition = packetplayinupdatesign.b();
@@ -1280,14 +2356,30 @@
2019-05-27 22:30:00 +02:00
if (!tileentitysign.d() || tileentitysign.f() != this.player) {
2020-06-25 02:00:00 +02:00
PlayerConnection.LOGGER.warn("Player {} just tried to change non-editable sign", this.player.getDisplayName().getString());
2016-05-10 13:47:39 +02:00
+ this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
return;
}
2018-07-15 02:00:00 +02:00
String[] astring = packetplayinupdatesign.c();
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start
+ Player player = this.server.getPlayer(this.player);
2018-07-15 02:00:00 +02:00
+ int x = packetplayinupdatesign.b().getX();
+ int y = packetplayinupdatesign.b().getY();
+ int z = packetplayinupdatesign.b().getZ();
2015-02-26 23:41:06 +01:00
+ String[] lines = new String[4];
2015-06-05 12:57:48 +02:00
+
2016-02-29 22:32:46 +01:00
for (int i = 0; i < astring.length; ++i) {
2020-06-25 02:00:00 +02:00
- tileentitysign.a(i, new ChatComponentText(EnumChatFormat.a(astring[i])));
+ lines[i] = EnumChatFormat.a(new ChatComponentText(EnumChatFormat.a(astring[i])).getString());
2015-06-05 12:57:48 +02:00
}
2015-02-26 23:41:06 +01:00
+ SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
+ this.server.getPluginManager().callEvent(event);
+
+ if (!event.isCancelled()) {
+ System.arraycopy(org.bukkit.craftbukkit.block.CraftSign.sanitizeLines(event.getLines()), 0, tileentitysign.lines, 0, 4);
+ tileentitysign.isEditable = false;
2015-06-05 12:57:48 +02:00
+ }
2015-02-26 23:41:06 +01:00
+ // CraftBukkit end
tileentitysign.update();
2016-02-29 22:32:46 +01:00
worldserver.notify(blockposition, iblockdata, iblockdata, 3);
@@ -1297,6 +2389,7 @@
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
2018-07-15 02:00:00 +02:00
+ PlayerConnectionUtils.ensureMainThread(packetplayinkeepalive, this, this.player.getWorldServer()); // CraftBukkit
2018-12-13 01:00:00 +01:00
if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
@@ -1311,7 +2404,17 @@
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInAbilities packetplayinabilities) {
2018-07-15 02:00:00 +02:00
PlayerConnectionUtils.ensureMainThread(packetplayinabilities, this, this.player.getWorldServer());
- this.player.abilities.isFlying = packetplayinabilities.isFlying() && this.player.abilities.canFly;
+ // CraftBukkit start
+ if (this.player.abilities.canFly && this.player.abilities.isFlying != packetplayinabilities.isFlying()) {
+ PlayerToggleFlightEvent event = new PlayerToggleFlightEvent(this.server.getPlayer(this.player), packetplayinabilities.isFlying());
+ this.server.getPluginManager().callEvent(event);
+ if (!event.isCancelled()) {
+ this.player.abilities.isFlying = packetplayinabilities.isFlying(); // Actually set the player's flying status
+ } else {
+ this.player.updateAbilities(); // Tell the player their ability was reverted
+ }
+ }
+ // CraftBukkit end
}
2019-04-23 04:00:00 +02:00
@Override
@@ -1320,8 +2423,50 @@
2018-07-15 02:00:00 +02:00
this.player.a(packetplayinsettings);
}
2017-04-20 14:10:31 +02:00
2019-04-23 04:00:00 +02:00
- @Override
2018-07-15 02:00:00 +02:00
- public void a(PacketPlayInCustomPayload packetplayincustompayload) {}
+ // CraftBukkit start
+ private static final MinecraftKey CUSTOM_REGISTER = new MinecraftKey("register");
+ private static final MinecraftKey CUSTOM_UNREGISTER = new MinecraftKey("unregister");
+
2019-04-23 04:00:00 +02:00
+ @Override
2018-07-15 02:00:00 +02:00
+ public void a(PacketPlayInCustomPayload packetplayincustompayload) {
+ PlayerConnectionUtils.ensureMainThread(packetplayincustompayload, this, this.player.getWorldServer());
+ if (packetplayincustompayload.tag.equals(CUSTOM_REGISTER)) {
+ try {
+ String channels = packetplayincustompayload.data.toString(com.google.common.base.Charsets.UTF_8);
+ for (String channel : channels.split("\0")) {
+ getPlayer().addChannel(channel);
+ }
+ } catch (Exception ex) {
+ PlayerConnection.LOGGER.error("Couldn\'t register custom payload", ex);
+ this.disconnect("Invalid payload REGISTER!");
2017-04-20 14:10:31 +02:00
+ }
2018-07-15 02:00:00 +02:00
+ } else if (packetplayincustompayload.tag.equals(CUSTOM_UNREGISTER)) {
+ try {
+ String channels = packetplayincustompayload.data.toString(com.google.common.base.Charsets.UTF_8);
+ for (String channel : channels.split("\0")) {
+ getPlayer().removeChannel(channel);
2017-04-20 14:10:31 +02:00
+ }
2018-07-15 02:00:00 +02:00
+ } catch (Exception ex) {
+ PlayerConnection.LOGGER.error("Couldn\'t unregister custom payload", ex);
+ this.disconnect("Invalid payload UNREGISTER!");
+ }
+ } else {
+ try {
+ byte[] data = new byte[packetplayincustompayload.data.readableBytes()];
+ packetplayincustompayload.data.readBytes(data);
+ server.getMessenger().dispatchIncomingMessage(player.getBukkitEntity(), packetplayincustompayload.tag.toString(), data);
+ } catch (Exception ex) {
+ PlayerConnection.LOGGER.error("Couldn\'t dispatch custom payload", ex);
+ this.disconnect("Invalid custom payload!");
+ }
+ }
+
+ }
2016-11-17 02:41:03 +01:00
+
+ public final boolean isDisconnected() {
2016-02-29 22:32:46 +01:00
+ return !this.player.joining && !this.networkManager.isConnected();
+ }
2018-07-15 02:00:00 +02:00
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
@Override
public void a(PacketPlayInDifficultyChange packetplayindifficultychange) {