mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-15 08:05:35 +02:00
fb25dc17c6
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 0cef14e4 Remove draft API from selectEntities CraftBukkit Changes:a46fdbc6Remove outdated build delay.3697519bSPIGOT-4708: Fix ExactChoice recipes neglecting material9ead7009SPIGOT-4677: Add minecraft.admin.command_feedback permissionc3749a23Remove the Damage tag from items when it is 0.f74c7b95SPIGOT-4706: Can't interact with active item494eef45Mention requirement of JIRA ticket for bug fixes51d62decSPIGOT-4702: Exception when middle clicking certain slotsbe557e69SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
56 lines
2.8 KiB
Diff
56 lines
2.8 KiB
Diff
From d5c2e00a30aa96c665393676e4dc49aa0a2feed2 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Wed, 17 Apr 2019 00:48:59 +0100
|
|
Subject: [PATCH] Fix NPE from sign placement
|
|
|
|
This fixes issues with upstreams changes to solve a private issue on
|
|
their side, as signs are placed, they may replace existing blocks, e.g.
|
|
grass, which breaks upstreams assumption that the sign is always placed
|
|
adjacent to a surface
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
index f5d9b4abc2..fdbe9a2adc 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -70,6 +70,7 @@ public abstract class EntityHuman extends EntityLiving {
|
|
public EntityFishingHook hookedFish;
|
|
// Paper start
|
|
public boolean affectsSpawning = true;
|
|
+ public BlockPosition openingSign = null; // Paper - fix NPE when opening signs
|
|
// Paper end
|
|
// Paper start - Player view distance API
|
|
private int viewDistance = -1;
|
|
diff --git a/src/main/java/net/minecraft/server/ItemSign.java b/src/main/java/net/minecraft/server/ItemSign.java
|
|
index 11045ee1e1..7808aed0c0 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemSign.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemSign.java
|
|
@@ -16,6 +16,7 @@ public class ItemSign extends ItemBlockWallable {
|
|
if (!world.isClientSide && !flag && entityhuman != null) {
|
|
// CraftBukkit start - SPIGOT-4678
|
|
// entityhuman.openSign((TileEntitySign) world.getTileEntity(blockposition));
|
|
+ entityhuman.openingSign = blockposition; // Paper - fix NPE when opening signs
|
|
ItemSign.openSign = true;
|
|
// CraftBukkit end
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
|
index f8d82a0276..ccc0826bc6 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
|
@@ -305,7 +305,12 @@ public final class ItemStack {
|
|
// SPIGOT-4678
|
|
if (this.item instanceof ItemSign && ItemSign.openSign) {
|
|
ItemSign.openSign = false;
|
|
- entityhuman.openSign((TileEntitySign) world.getTileEntity(new BlockActionContext(itemactioncontext).getClickPosition()));
|
|
+ // Paper start - fix NPE when opening signs
|
|
+ if (entityhuman.openingSign != null) {
|
|
+ entityhuman.openSign((TileEntitySign) world.getTileEntity(entityhuman.openingSign));
|
|
+ entityhuman.openingSign = null;
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
|
|
// SPIGOT-1288 - play sound stripped from ItemBlock
|
|
--
|
|
2.21.0
|
|
|