DemonWav / CraftBukkit / 3ae3ea08f21

Commits

md_5 authored 3ae3ea08f21 11 Jun 2016

SPIGOT-1550, SPIGOT-2306: Custom payload / book + event fixes

nms-patches/PlayerConnection.patch

Modified

-1590
+         PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.x());
-1591
++        // CraftBukkit start
-1592
++        if (chatSpamField.addAndGet(this, 10) > 500 && !this.minecraftServer.getPlayerList().isOp(this.player.getProfile())) {
-1593
++            this.disconnect("disconnect.spam");
-1594
++            return;
-1595
++        }
-1596
++        // CraftBukkit end
-1597
+         ArrayList arraylist = Lists.newArrayList();
-1598
+         Iterator iterator = this.minecraftServer.tabCompleteCommand(this.player, packetplayintabcomplete.a(), packetplayintabcomplete.b(), packetplayintabcomplete.c()).iterator();
-1599
--
+@@ -1334,12 +2409,34 @@
--
+                             PlayerConnection.LOGGER.error("Couldn\'t pick item", exception7);
-+
+@@ -1040,10 +2115,13 @@
-+
+                 }
-+
-+
+                 if (itemstack.getItem() == Items.WRITABLE_BOOK && itemstack.getItem() == itemstack1.getItem()) {
-+
++                    itemstack1 = new ItemStack(Items.WRITABLE_BOOK); // CraftBukkit
-+
+                     itemstack1.a("pages", (NBTBase) itemstack.getTag().getList("pages", 8));
-+
++                    CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
-+
+                 }
-+
+             } catch (Exception exception) {
-+
+                 PlayerConnection.LOGGER.error("Couldn\'t handle book info", exception);
-+
++                this.disconnect("Invalid book data!"); // CraftBukkit
-+
+             }
-+
+         } else {
-+
+             String s1;
-+
+@@ -1067,6 +2145,7 @@
-+
+                     }
-+
-+
+                     if (itemstack.getItem() == Items.WRITABLE_BOOK && itemstack1.getItem() == Items.WRITABLE_BOOK) {
-+
++                        itemstack1 = new ItemStack(Items.WRITABLE_BOOK); // CraftBukkit
-+
+                         itemstack1.a("author", (NBTBase) (new NBTTagString(this.player.getName())));
-+
+                         itemstack1.a("title", (NBTBase) (new NBTTagString(itemstack.getTag().getString("title"))));
-+
+                         NBTTagList nbttaglist = itemstack.getTag().getList("pages", 8);
-+
+@@ -1081,9 +2160,11 @@
-+
-+
+                         itemstack1.a("pages", (NBTBase) nbttaglist);
-+
+                         itemstack1.setItem(Items.WRITTEN_BOOK);
-+
++                        CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit
-+
+                     }
-+
+                 } catch (Exception exception1) {
-+
+                     PlayerConnection.LOGGER.error("Couldn\'t sign book", exception1);
-+
++                    this.disconnect("Invalid book data!"); // CraftBukkit
-+
+                 }
-+
+             } else if ("MC|TrSel".equals(s)) {
-+
+                 try {
-+
+@@ -1095,6 +2176,7 @@
-+
+                     }
-+
+                 } catch (Exception exception2) {
-+
+                     PlayerConnection.LOGGER.error("Couldn\'t select trade", exception2);
-+
++                    this.disconnect("Invalid trade data!"); // CraftBukkit
-+
+                 }
-+
+             } else {
-+
+                 TileEntity tileentity;
-+
+@@ -1144,6 +2226,7 @@
-1643
+                         }
-+
+                     } catch (Exception exception3) {
-+
+                         PlayerConnection.LOGGER.error("Couldn\'t set command block", exception3);
-+
++                        this.disconnect("Invalid command data!"); // CraftBukkit
-1647
+                     }
-+
+                 } else if ("MC|AutoCmd".equals(s)) {
-+
+                     if (!this.minecraftServer.getEnableCommandBlock()) {
-+
+@@ -1211,6 +2294,7 @@
-+
+                         }
-+
+                     } catch (Exception exception4) {
-+
+                         PlayerConnection.LOGGER.error("Couldn\'t set command block", exception4);
-+
++                        this.disconnect("Invalid command data!"); // CraftBukkit
-+
+                     }
-+
+                 } else {
-+
+                     int k;
-+
+@@ -1234,6 +2318,7 @@
-+
+                                 }
-+
+                             } catch (Exception exception5) {
-+
+                                 PlayerConnection.LOGGER.error("Couldn\'t set beacon", exception5);
-+
++                                this.disconnect("Invalid beacon data!"); // CraftBukkit
-+
+                             }
-+
+                         }
-+
+                     } else if ("MC|ItemName".equals(s)) {
-+
+@@ -1320,6 +2405,7 @@
-+
+                             }
-+
+                         } catch (Exception exception6) {
-+
+                             PlayerConnection.LOGGER.error("Couldn\'t set structure block", exception6);
-+
++                            this.disconnect("Invalid structure data!"); // CraftBukkit
-+
+                         }
-+
+                     } else if ("MC|PickItem".equals(s)) {
-+
+                         packetdataserializer = packetplayincustompayload.b();
-+
+@@ -1332,14 +2418,37 @@
-+
+                             this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex));
-+
+                         } catch (Exception exception7) {
-+
+                             PlayerConnection.LOGGER.error("Couldn\'t pick item", exception7);
-+
++                            this.disconnect("Invalid item data!"); // CraftBukkit
-+
++                        }
-+
++                    }
-1681
++                    // CraftBukkit start
-1682
++                    else if (packetplayincustompayload.a().equals("REGISTER")) {
-1683
++                        String channels = packetplayincustompayload.b().toString(com.google.common.base.Charsets.UTF_8);
-1684
++                        for (String channel : channels.split("\0")) {
-1685
++                            getPlayer().addChannel(channel);
--
++                        }
-+
+                         }
-1687
++                    } else if (packetplayincustompayload.a().equals("UNREGISTER")) {
-1688
++                        String channels = packetplayincustompayload.b().toString(com.google.common.base.Charsets.UTF_8);
-1689
++                        for (String channel : channels.split("\0")) {
-1690
++                            getPlayer().removeChannel(channel);
-1691
++                        }
-1692
++                    } else {
-1693
++                        byte[] data = new byte[packetplayincustompayload.b().readableBytes()];
-1694
++                        packetplayincustompayload.b().readBytes(data);
-1695
++                        server.getMessenger().dispatchIncomingMessage(player.getBukkitEntity(), packetplayincustompayload.a(), data);
--
++                    }
-+
+                     }
-1697
++                    // CraftBukkit end
-1698
+                 }
-1699
+             }
-1700
+         }
-1701
-1702
+     }
-1703
-1704
++    // CraftBukkit start - Add "isDisconnected" method
-1705
++    public final boolean isDisconnected() {
-1706
++        return !this.player.joining && !this.networkManager.isConnected();

CraftBukkit

Commits

Jira Issues

Add shortcut