revert changes to disabled plugins and scheduler.
sorry for messy commit,doing via tablet on ssh md_5 By: Hudson <hudson@mydomain.com>
This commit is contained in:
@@ -1,15 +1,15 @@
|
||||
From a7b8ea293d6a2ef96c39eac11a54113e7dd24288 Mon Sep 17 00:00:00 2001
|
||||
From 6a9329fd0687f6316cb92c898bf8ed4ed4b3550e Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Mon, 18 Mar 2013 20:01:44 +1100
|
||||
Subject: [PATCH] Prevent NPE in CraftSign
|
||||
|
||||
This commit prevents the constructor of CraftSign throwing an NPE when it cannot get the sign tile entity. Instead it will fallback to a 4 empty lined sign, and not try to do anything to those lines on .update().
|
||||
---
|
||||
src/main/java/org/bukkit/craftbukkit/block/CraftSign.java | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
.../org/bukkit/craftbukkit/block/CraftSign.java | 8 +++++++-
|
||||
1 files changed, 7 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
||||
index 8e8a1c5..87af049 100644
|
||||
index 1647100..43c4434 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
|
||||
@@ -14,6 +14,12 @@ public class CraftSign extends CraftBlockState implements Sign {
|
||||
@@ -26,8 +26,8 @@ index 8e8a1c5..87af049 100644
|
||||
System.arraycopy(sign.lines, 0, lines, 0, lines.length);
|
||||
}
|
||||
@@ -34,7 +40,7 @@ public class CraftSign extends CraftBlockState implements Sign {
|
||||
public boolean update(boolean force) {
|
||||
boolean result = super.update(force);
|
||||
public boolean update(boolean force, boolean applyPhysics) {
|
||||
boolean result = super.update(force, applyPhysics);
|
||||
|
||||
- if (result) {
|
||||
+ if (result && sign != null) { // Spigot, add null check
|
||||
@@ -35,5 +35,5 @@ index 8e8a1c5..87af049 100644
|
||||
if(lines[i] != null) {
|
||||
sign.lines[i] = lines[i];
|
||||
--
|
||||
1.8.1-rc2
|
||||
1.7.0.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user