mirror of
https://github.com/PaperMC/Paper.git
synced 2025-03-25 00:07:36 +01:00
Update patch numbers
This commit is contained in:
parent
03dd521324
commit
fd14a5cf0e
17 changed files with 17 additions and 21 deletions
CraftBukkit-Patches
0147-Rename-to-PaperSpigot.patch0148-Prevent-null-hopper-owners-crashing-the-server.patch0149-Allow-undead-horse-types-to-be-leashed.patch0150-Teleport-passenger-vehicle-with-player.patch0151-Invisible-players-don-t-have-rights.patch0152-Configurable-squid-spawn-ranges.patch0153-Add-getFloat-method-to-configs.patch0154-Configurable-damage-multiplier-for-PvP-blocking.patch0155-Configurable-cactus-and-reed-natural-growth-heights.patch0156-Configurable-baby-zombie-movement-speed.patch0157-Make-destroyed-boats-drop-the-boat-item.patch0158-Configurable-hunger-multiplier-for-player-sprint-jum.patch0159-Inverted-Daylight-Detector-Toggle.patch0160-Add-1.8-recipes-for-stone-variants.patch0161-Fix-movement-inconsistencies.patch0162-Fix-redstone-lag-issues.patch0163-Ability-to-disable-asynccatcher.patch
|
@ -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
|
||||
|
||||
--
|
|
@ -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;
|
|
@ -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;
|
Loading…
Add table
Reference in a new issue