CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuild patches

Browse Source
This commit is contained in:
Zach Brown 2015-04-13 15:48:16 -05:00
parent 9a77c8ec95
commit e62cf21c8f
5 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0012-Allow-nerfed-mobs-to-jump.patch
View File

@ -1,14 +1,14 @@
From fb2cc2c1096ef34b2f7a046f14823dcb7f29ee0f Mon Sep 17 00:00:00 2001 From 3f8f70c97cbdcc1ecc64d7ae417b98e11bdd72fe Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 7 Mar 2015 21:03:06 -0600 Date: Sat, 7 Mar 2015 21:03:06 -0600
Subject: [PATCH] Allow nerfed mobs to jump Subject: [PATCH] Allow nerfed mobs to jump
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 134897a..b580217 100644 index 9621ce0..261bfb7 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java --- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -454,6 +454,12 @@ public abstract class EntityInsentient extends EntityLiving { @@ -461,6 +461,12 @@ public abstract class EntityInsentient extends EntityLiving {
// Spigot Start // Spigot Start
if ( this.fromMobSpawner ) if ( this.fromMobSpawner )
{ {
@ -22,5 +22,5 @@ index 134897a..b580217 100644
} }
// Spigot End // Spigot End
-- --
1.9.1 2.3.5

8
Spigot-Server-Patches/0015-Add-configurable-despawn-distances-for-living-entiti.patch
View File

@ -1,14 +1,14 @@
From f2298a52883de199283cd20f55fc72b43585dc45 Mon Sep 17 00:00:00 2001 From 0a3b20f045f56f1d5f879b9cb76e87eab1ab8ee6 Mon Sep 17 00:00:00 2001
From: Suddenly <suddenly@suddenly.coffee> From: Suddenly <suddenly@suddenly.coffee>
Date: Sat, 7 Mar 2015 21:40:48 -0600 Date: Sat, 7 Mar 2015 21:40:48 -0600
Subject: [PATCH] Add configurable despawn distances for living entities Subject: [PATCH] Add configurable despawn distances for living entities
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index b580217..4f49ed0 100644 index 261bfb7..b0cae5b 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java --- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -432,13 +432,13 @@ public abstract class EntityInsentient extends EntityLiving { @@ -439,13 +439,13 @@ public abstract class EntityInsentient extends EntityLiving {
double d2 = entityhuman.locZ - this.locZ; double d2 = entityhuman.locZ - this.locZ;
double d3 = d0 * d0 + d1 * d1 + d2 * d2; double d3 = d0 * d0 + d1 * d1 + d2 * d2;
@ -52,5 +52,5 @@ index ac2f470..7ad9bb3 100644
+ } + }
} }
-- --
1.9.1 2.3.5

8
Spigot-Server-Patches/0019-Player-affects-spawning-API.patch
View File

@ -1,4 +1,4 @@
From 259f5e95b81da92d16c768d14b3616f2367ccd72 Mon Sep 17 00:00:00 2001 From 031921da8c8f2b9dd9e7afc863b26f61983a873b Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 7 Mar 2015 22:52:21 -0600 Date: Sat, 7 Mar 2015 22:52:21 -0600
Subject: [PATCH] Player affects spawning API Subject: [PATCH] Player affects spawning API
@ -17,10 +17,10 @@ index e7fd331..4aa8096 100644
// CraftBukkit start // CraftBukkit start
public boolean fauxSleeping; public boolean fauxSleeping;
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 4f49ed0..c0d1c13 100644 index b0cae5b..e4c1cd8 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java --- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -424,7 +424,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -431,7 +431,7 @@ public abstract class EntityInsentient extends EntityLiving {
if (this.persistent) { if (this.persistent) {
this.ticksFarFromPlayer = 0; this.ticksFarFromPlayer = 0;
} else { } else {
@ -143,5 +143,5 @@ index 06e014c..5d5f987 100644
public Player.Spigot spigot() public Player.Spigot spigot()
-- --
1.9.1 2.3.5

8
Spigot-Server-Patches/0033-Allow-specified-ItemStacks-to-retain-their-invalid-d.patch
View File

@ -1,11 +1,11 @@
From 3d8002fbf829ebd6cb4e4d771334fa935e4419e5 Mon Sep 17 00:00:00 2001 From 7e08519d06c1e7334714dc502deec42b3cd34a1d Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Sun, 30 Nov 2014 18:58:07 -0600 Date: Sun, 30 Nov 2014 18:58:07 -0600
Subject: [PATCH] Allow specified ItemStacks to retain their invalid data Subject: [PATCH] Allow specified ItemStacks to retain their invalid data
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 9a7c7cb..7b18476 100644 index 1984e7c..e6b557e 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java --- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -18,6 +18,8 @@ import org.bukkit.entity.Player; @@ -18,6 +18,8 @@ import org.bukkit.entity.Player;
@ -17,7 +17,7 @@ index 9a7c7cb..7b18476 100644
public final class ItemStack { public final class ItemStack {
public static final DecimalFormat a = new DecimalFormat("#.###"); public static final DecimalFormat a = new DecimalFormat("#.###");
@@ -312,9 +314,13 @@ public final class ItemStack { @@ -320,9 +322,13 @@ public final class ItemStack {
} }
// Is this a block? // Is this a block?
@ -64,5 +64,5 @@ index c57f83b..19ef586 100644
+ } + }
} }
-- --
1.9.1 2.3.5

24
Spigot-Server-Patches/0040-Fix-redstone-lag-issues.patch
View File

@ -1,23 +1,15 @@
From bd16f6b7d98e99ca219ebb5f0f1576c8ce371874 Mon Sep 17 00:00:00 2001 From 19fab5f746af8326b585e65c5357955896a345f4 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 7 Mar 2015 20:49:31 -0600 Date: Mon, 13 Apr 2015 15:47:15 -0500
Subject: [PATCH] Fix redstone lag issues Subject: [PATCH] Fix redstone lag issues
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index a599869..5d73d88 100644 index 261c86c..e34e7fd 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -22,7 +22,6 @@ import java.util.logging.Level; @@ -611,6 +611,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
if (false) { // CraftBukkit
import org.bukkit.WeatherType;
import org.bukkit.block.BlockState;
-import org.bukkit.craftbukkit.util.LongHash;
import org.bukkit.event.block.BlockFormEvent;
import org.bukkit.event.weather.LightningStrikeEvent;
@@ -610,6 +609,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
if (i != this.L.size()) {
throw new IllegalStateException("TickNextTick list out of synch"); throw new IllegalStateException("TickNextTick list out of synch");
} else { } else {
+ // PaperSpigot start - No, stop doing this, it affects things like redstone + // PaperSpigot start - No, stop doing this, it affects things like redstone
@ -25,7 +17,7 @@ index a599869..5d73d88 100644
if (i > 1000) { if (i > 1000) {
// CraftBukkit start - If the server has too much to process over time, try to alleviate that // CraftBukkit start - If the server has too much to process over time, try to alleviate that
if (i > 20 * 1000) { if (i > 20 * 1000) {
@@ -618,7 +619,11 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -619,7 +621,11 @@ public class WorldServer extends World implements IAsyncTaskHandler {
i = 1000; i = 1000;
} }
// CraftBukkit end // CraftBukkit end
@ -54,5 +46,5 @@ index 1915a7c..fa4a7d7 100644
+ } + }
} }
-- --
1.9.1 2.3.5