Fix NPE when getting location from players EnderChest (fixes #1041)

This commit is contained in:
Shane Freeder
2018-03-10 13:07:40 +00:00
parent 09692269ca
commit 9daa9cec93
9 changed files with 120 additions and 101 deletions

View File

@@ -1,11 +1,11 @@
From 2d386d626a9e65f14718881154a9162ea224cea1 Mon Sep 17 00:00:00 2001
From c508818bba262f715b0e95376b03d60b497939c2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 27 Dec 2016 15:02:42 -0500
Subject: [PATCH] String based Action Bar API
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
index a4b0901..02940d6 100644
index a4b0901cf..02940d697 100644
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
@@ -1,10 +1,13 @@
@@ -62,13 +62,14 @@ index a4b0901..02940d6 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 98e9da5..a9186b7 100644
index 98e9da59a..a9186b77a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -170,6 +170,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -169,6 +169,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper start
@Override
+ @Override
+ public void sendActionBar(String message) {
+ if (getHandle().playerConnection == null || message == null || message.isEmpty()) return;
+ getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new ChatComponentText(message), ChatMessageType.GAME_INFO));
@@ -80,10 +81,9 @@ index 98e9da5..a9186b7 100644
+ sendActionBar(org.bukkit.ChatColor.translateAlternateColorCodes(alternateChar, message));
+ }
+
+ @Override
@Override
public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
packet.header = header;
--
2.7.4
2.16.2