mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent null hopper owners crashing the server

Browse source
This commit is contained in:
Suddenly 2014-06-22 15:24:20 -05:00 committed by Zach Brown
parent b9179a0a04
commit 62ae1a679c
1 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
CraftBukkit-Patches/0150-Prevent-null-hopper-owners-crashing-the-server.patch Normal file
View file

@ -0,0 +1,44 @@
From 49438c7205d9dbb80e861a3c7c5bd113e45de256 Mon Sep 17 00:00:00 2001
From: Suddenly <suddenly@suddenly.coffee>
Date: Tue, 27 May 2014 14:00:41 +0100
Subject: [PATCH] Prevent null hopper owners crashing the server
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index c7b3495..45be65f 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -243,13 +243,23 @@ public class TileEntityHopper extends TileEntity implements IHopper {
if (!this.j() && BlockHopper.c(this.p())) {
boolean flag = false;
- if (!this.k()) {
- flag = this.x();
- }
-
- if (!this.l()) {
- flag = suckInItems(this) || flag;
- }
+ try { // PaperSpigot Start (Try/catch to prevent null owner crash)
+ if (!this.k()) {
+ flag = this.x();
+ }
+ } catch (NullPointerException e) {
+ this.getWorld().setAir(this.x, this.y, this.z);
+ org.bukkit.Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Null owner found for hopper, removing hopper at {0} {1}, {2}, {3}", new Object[]{this.getWorld().getWorld().getName(), this.x, this.y, this.z});
+ }
+
+ try {
+ if (!this.l()) {
+ flag = suckInItems(this) || flag;
+ }
+ } catch (NullPointerException e) {
+ this.getWorld().setAir(this.x, this.y, this.z);
+ org.bukkit.Bukkit.getLogger().log(java.util.logging.Level.WARNING, "Null owner found for hopper, removing hopper at {0} {1}, {2}, {3}", new Object[]{this.getWorld().getWorld().getName(), this.x, this.y, this.z});
+ } // PaperSpigot End
if (flag) {
this.c(world.spigotConfig.hopperTransfer); // Spigot
--
1.9.1