Update patch numbers

This commit is contained in:
Zach Brown 2014-06-22 15:55:54 -05:00
parent 03dd521324
commit fd14a5cf0e
17 changed files with 17 additions and 21 deletions

View File

@ -1,14 +1,14 @@
From 33e33efcbabfaf4dc2beb6ac2a0dab488ecbd620 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: gsand <gsandowns@gmail.com>
Date: Tue, 15 Apr 2014 07:12:20 -0700
Subject: [PATCH] Rename to PaperSpigot
diff --git a/pom.xml b/pom.xml
index df02bd3..e068516 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
@@ -0,0 +0,0 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.spigotmc</groupId>
@ -17,7 +17,7 @@ index df02bd3..e068516 100644
<packaging>jar</packaging>
<version>1.7.9-R0.3-SNAPSHOT</version>
<name>Spigot</name>
@@ -119,7 +119,7 @@
@@ -0,0 +0,0 @@
<artifactId>gitdescribe-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
@ -26,6 +26,4 @@ index df02bd3..e068516 100644
<outputPostfix></outputPostfix>
</configuration>
<executions>
--
1.9.1
--

View File

@ -14,11 +14,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- 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();
@ -26,8 +21,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } 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});
+ }
+
}
- if (!this.l()) {
- flag = suckInItems(this) || flag;
- }
+ try {
+ if (!this.l()) {
+ flag = suckInItems(this) || flag;

View File

@ -58,12 +58,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ for (j = 0; j < list.size(); ++j) {
+ d0 = ((AxisAlignedBB) list.get(j)).a(this.boundingBox, d0);
+ }
- this.boundingBox.d(0.0D, 0.0D, d2);
- if (!this.J && d8 != d2) {
- d2 = 0.0D;
- d1 = 0.0D;
- d0 = 0.0D;
+
+ this.boundingBox.d(d0, 0.0D, 0.0D);
+ if (!this.J && d6 != d0) {
+ d2 = 0.0D;
@ -85,7 +80,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ for (int i = 0; i < list.size(); ++i) {
+ d1 = ((AxisAlignedBB) list.get(i)).b(this.boundingBox, d1);
+ }
+
- this.boundingBox.d(0.0D, 0.0D, d2);
- if (!this.J && d8 != d2) {
- d2 = 0.0D;
- d1 = 0.0D;
- d0 = 0.0D;
+ this.boundingBox.d(0.0D, d1, 0.0D);
+ if (!this.J && d7 != d1) {
+ d2 = 0.0D;