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

Rebuild patches for upstream changes

Browse Source
This commit is contained in:
Zach Brown 2015-10-02 22:58:02 -05:00
parent b7124e06be
commit 9365b36050
11 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0020-Metrics.patch
View File

@ -1,6 +1,6 @@
From 23dd01f0baff0c2b06f42048d6d77c31a49e029d Mon Sep 17 00:00:00 2001 From a7cb1698f46a168af727798e55ef5116bf8ddde2 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 18 May 2015 18:58:44 -0500 Date: Wed, 18 Mar 2015 22:55:25 -0600
Subject: [PATCH] Metrics Subject: [PATCH] Metrics
@ -18,5 +18,5 @@ index a5fd59d..558989c 100644
String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"; String pluginVersion = (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown";
String serverVersion = Bukkit.getVersion(); String serverVersion = Bukkit.getVersion();
-- --
2.5.1 2.6.0

6
Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch
View File

@ -1,6 +1,6 @@
From e53f4135434c8a9b344c5bb03e9f7c963bbb7833 Mon Sep 17 00:00:00 2001 From 82203f5b964a9ebb9a3cf4d62381a7d4512b4753 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Sun, 8 Mar 2015 01:06:14 -0600 Date: Sun, 8 Mar 2015 22:55:25 -0600
Subject: [PATCH] Remove invalid mob spawner tile entities Subject: [PATCH] Remove invalid mob spawner tile entities
@ -37,5 +37,5 @@ index d0a97b6..5aa368f 100644
+ } + }
} }
-- --
2.5.1 2.6.0

6
Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch
View File

@ -1,6 +1,6 @@
From 5a25c7f79274223ab53f27336824a0d251c15f30 Mon Sep 17 00:00:00 2001 From f86213eb2c1cef2e9cc2ccabf338ebd388c12dcb Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 8 Mar 2015 01:56:22 -0600 Date: Sun, 8 Mar 2015 22:55:25 -0600
Subject: [PATCH] Optimize TileEntity Ticking Subject: [PATCH] Optimize TileEntity Ticking
@ -234,5 +234,5 @@ index 641db2a..8a2d2c0 100644
entity = (Entity) this.entityList.get(this.tickPosition); entity = (Entity) this.entityList.get(this.tickPosition);
// CraftBukkit end // CraftBukkit end
-- --
2.5.2 2.6.0

12
Spigot-Server-Patches/0036-Always-tick-falling-blocks.patch
View File

@ -1,22 +1,22 @@
From 8e7c47614e9af22d1823a2d1bfde89dfbd7153d3 Mon Sep 17 00:00:00 2001 From d983745c2061cbee37aa5a1ed042ae595b75dfbe Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 10 Apr 2015 18:07:36 -0500 Date: Fri, 10 Apr 2015 18:07:36 -0500
Subject: [PATCH] Always tick falling blocks Subject: [PATCH] Always tick falling blocks
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 621a717..7ca1b24 100644 index d8d54bd..d6311bd 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -13,6 +13,7 @@ import net.minecraft.server.EntityComplexPart; @@ -14,6 +14,7 @@ import net.minecraft.server.EntityCreature;
import net.minecraft.server.EntityCreature; import net.minecraft.server.EntityCreeper;
import net.minecraft.server.EntityEnderCrystal; import net.minecraft.server.EntityEnderCrystal;
import net.minecraft.server.EntityEnderDragon; import net.minecraft.server.EntityEnderDragon;
+import net.minecraft.server.EntityFallingBlock; +import net.minecraft.server.EntityFallingBlock;
import net.minecraft.server.EntityFireball; import net.minecraft.server.EntityFireball;
import net.minecraft.server.EntityFireworks; import net.minecraft.server.EntityFireworks;
import net.minecraft.server.EntityHuman; import net.minecraft.server.EntityHuman;
@@ -80,6 +81,7 @@ public class ActivationRange @@ -82,6 +83,7 @@ public class ActivationRange
|| entity instanceof EntityFireball || entity instanceof EntityFireball
|| entity instanceof EntityWeather || entity instanceof EntityWeather
|| entity instanceof EntityTNTPrimed || entity instanceof EntityTNTPrimed
@ -25,5 +25,5 @@ index 621a717..7ca1b24 100644
|| entity instanceof EntityFireworks ) || entity instanceof EntityFireworks )
{ {
-- --
2.5.2 2.6.0

14
Spigot-Server-Patches/0041-Add-PlayerLocaleChangeEvent.patch
View File

@ -1,6 +1,6 @@
From 3652d4118b8ce9662aff38f6c0f91afb578aea7c Mon Sep 17 00:00:00 2001 From 8dff59c6bbe54bad21324805a3302cf346c987c9 Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com> From: Isaac Moore <rmsy@me.com>
Date: Mon, 27 Apr 2015 21:41:39 -0500 Date: Fri, 27 Mar 2015 00:52:24 -0400
Subject: [PATCH] Add PlayerLocaleChangeEvent Subject: [PATCH] Add PlayerLocaleChangeEvent
@ -23,12 +23,12 @@ index 3810f86..be50b55 100644
this.bS = packetplayinsettings.d(); this.bS = packetplayinsettings.d();
this.getDataWatcher().watch(10, Byte.valueOf((byte) packetplayinsettings.e())); this.getDataWatcher().watch(10, Byte.valueOf((byte) packetplayinsettings.e()));
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index d1bd480..2dd8508 100644 index 147b928..db91503 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -963,4 +963,13 @@ public class CraftEventFactory { @@ -970,4 +970,13 @@ public class CraftEventFactory {
entityHuman.world.getServer().getPluginManager().callEvent(event); firework.world.getServer().getPluginManager().callEvent(event);
return (Cancellable) event; return event;
} }
+ +
+ // PaperSpigot start - Add PlayerLocaleChangeEvent + // PaperSpigot start - Add PlayerLocaleChangeEvent
@ -41,5 +41,5 @@ index d1bd480..2dd8508 100644
+ // PaperSpigot end + // PaperSpigot end
} }
-- --
2.5.2 2.6.0

8
Spigot-Server-Patches/0044-Force-load-chunks-for-specific-entities-that-fly-thr.patch
View File

@ -1,4 +1,4 @@
From 068eb2ed78e703619a74bcd0005e5b1d82187def Mon Sep 17 00:00:00 2001 From b2518be88123abedcdf2dfad331dbd0ef7a68026 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Tue, 30 Jun 2015 20:45:24 -0700 Date: Tue, 30 Jun 2015 20:45:24 -0700
Subject: [PATCH] Force load chunks for specific entities that fly through Subject: [PATCH] Force load chunks for specific entities that fly through
@ -189,10 +189,10 @@ index 36e0948..a78d748 100644
+ } + }
} }
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 7ca1b24..6f3734b 100644 index d6311bd..5b0c64d 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -247,7 +247,7 @@ public class ActivationRange @@ -252,7 +252,7 @@ public class ActivationRange
{ {
SpigotTimings.checkIfActiveTimer.startTiming(); SpigotTimings.checkIfActiveTimer.startTiming();
// Never safe to skip fireworks or entities not yet added to chunk // Never safe to skip fireworks or entities not yet added to chunk
@ -202,5 +202,5 @@ index 7ca1b24..6f3734b 100644
return true; return true;
} }
-- --
2.5.2 2.6.0

6
Spigot-Server-Patches/0045-Stackable-Buckets.patch
View File

@ -1,6 +1,6 @@
From ebf538a6ac13883b289be7ed1b172f28d860c4cb Mon Sep 17 00:00:00 2001 From afb88d4d332f4496e7dafe36d397e4156df10b4d Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Mon, 1 Jun 2015 22:21:52 -0700 Date: Mon, 1 Jun 2015 20:45:24 -0700
Subject: [PATCH] Stackable Buckets Subject: [PATCH] Stackable Buckets
@ -170,5 +170,5 @@ index 744773d..31c4cf8 100644
+ } + }
} }
-- --
2.5.2 2.6.0

6
Spigot-Server-Patches/0050-Optimize-explosions.patch
View File

@ -1,6 +1,6 @@
From 617a0b0fb8cec2797ac378a971d7e7ec4954dc14 Mon Sep 17 00:00:00 2001 From 583847a7988a8a24def401ec16a207e110cd2845 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Tue, 16 Jun 2015 05:52:58 -0700 Date: Tue, 16 Jun 2015 00:43:17 -0700
Subject: [PATCH] Optimize explosions Subject: [PATCH] Optimize explosions
The process of determining an entity's exposure from explosions can be The process of determining an entity's exposure from explosions can be
@ -149,5 +149,5 @@ index 88e0644..f3228d9 100644
+ } + }
} }
-- --
2.5.2 2.6.0

6
Spigot-Server-Patches/0052-Fast-draining.patch
View File

@ -1,6 +1,6 @@
From 02730e4570adc6ea676a5e9d6a12e0b5bbdc55e5 Mon Sep 17 00:00:00 2001 From f52fd3b116d6cfbbe30bf9d80fd890c7938be025 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Tue, 30 Jun 2015 19:53:03 -0700 Date: Tue, 30 Jun 2015 19:31:02 -0700
Subject: [PATCH] Fast draining Subject: [PATCH] Fast draining
@ -97,5 +97,5 @@ index f3228d9..2ecacd5 100644
+ } + }
} }
-- --
2.5.2 2.6.0

6
Spigot-Server-Patches/0063-Optimize-Spigot-s-Anti-X-Ray.patch
View File

@ -1,6 +1,6 @@
From b082a854d2fa598ed788c8e7803b10e7c95a1e78 Mon Sep 17 00:00:00 2001 From 90cfceb6acf7723815e95fee4f9f6a24277bae50 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv> From: Iceee <andrew@opticgaming.tv>
Date: Thu, 23 Jul 2015 04:23:23 -0700 Date: Thu, 23 Apr 2015 17:26:21 -0400
Subject: [PATCH] Optimize Spigot's Anti X-Ray Subject: [PATCH] Optimize Spigot's Anti X-Ray
@ -84,5 +84,5 @@ index 7221b50..5466a61 100644
updateNearbyBlocks( world, position, 2, false ); // 2 is the radius, we shouldn't change it as that would make it exponentially slower updateNearbyBlocks( world, position, 2, false ); // 2 is the radius, we shouldn't change it as that would make it exponentially slower
update.stopTiming(); update.stopTiming();
-- --
2.5.2 2.6.0

6
Spigot-Server-Patches/0064-Add-BeaconEffectEvent.patch
View File

@ -1,6 +1,6 @@
From 3e7777bd774d36609d4d8a66bce37462ecf5424e Mon Sep 17 00:00:00 2001 From 6acc3fe86bba094e83297ba49c93452aa01cd4d1 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Thu, 23 Jul 2015 12:44:06 -0700 Date: Thu, 23 Apr 2015 17:26:21 -0400
Subject: [PATCH] Add BeaconEffectEvent Subject: [PATCH] Add BeaconEffectEvent
@ -62,5 +62,5 @@ index 4f280dd..f4717af 100644
} }
} }
-- --
2.5.2 2.6.0