core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update B/CB

This commit is contained in:
Shane Freeder 2017-07-28 14:45:16 +01:00
parent d841b8a345
commit fed4815fff
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
72 changed files with 347 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-API-Patches/0054-PlayerPickupItemEvent-setFlyAtPlayer.patch
View File

@ -1,14 +1,14 @@
From 447ed7747e09f6b38ea1119083b95c47c55e1bab Mon Sep 17 00:00:00 2001 From a53027c798480be3017e4e592c0f8667e63bc612 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 May 2017 06:26:01 -0500 Date: Sun, 7 May 2017 06:26:01 -0500
Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
index dfba8163..83ee01f7 100644 index 29f03f5d..da19009b 100644
--- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
@@ -11,6 +11,7 @@ import org.bukkit.event.HandlerList; @@ -14,6 +14,7 @@ import org.bukkit.event.entity.EntityPickupItemEvent;
public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable { public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private final Item item; private final Item item;
@ -16,7 +16,7 @@ index dfba8163..83ee01f7 100644
private boolean cancel = false; private boolean cancel = false;
private final int remaining; private final int remaining;
@@ -38,12 +39,34 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable { @@ -41,12 +42,34 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
return remaining; return remaining;
} }
@ -52,5 +52,5 @@ index dfba8163..83ee01f7 100644
@Override @Override
-- --
2.13.1 2.13.3

4
Spigot-API-Patches/0057-Add-UnknownCommandEvent.patch → Spigot-API-Patches/0056-Add-UnknownCommandEvent.patch
View File

@ -1,4 +1,4 @@
From d84e33b34c717e1200495f444aeb93582a7086e0 Mon Sep 17 00:00:00 2001 From f57a4ab8a98fe14d6591558f0eb061caf775b542 Mon Sep 17 00:00:00 2001
From: Sweepyoface <github@sweepy.pw> From: Sweepyoface <github@sweepy.pw>
Date: Sat, 17 Jun 2017 18:48:06 -0400 Date: Sat, 17 Jun 2017 18:48:06 -0400
Subject: [PATCH] Add UnknownCommandEvent Subject: [PATCH] Add UnknownCommandEvent
@ -88,5 +88,5 @@ index 00000000..19d634c3
+} +}
+ +
-- --
2.13.2 2.13.3

63
Spigot-API-Patches/0056-EntityPickupItemEvent.patch
View File

@ -1,63 +0,0 @@
From 92a2a2f1b72749139bbbb785746b546a3741474f Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 May 2017 01:16:10 -0500
Subject: [PATCH] EntityPickupItemEvent
diff --git a/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java b/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
new file mode 100644
index 00000000..3d40b515
--- /dev/null
+++ b/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
@@ -0,0 +1,48 @@
+package org.bukkit.event.entity;
+
+import org.bukkit.entity.Item;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+
+/**
+ * Thrown when an entity picks an item up from the ground
+ */
+public class EntityPickupItemEvent extends EntityEvent implements Cancellable {
+ private static final HandlerList handlers = new HandlerList();
+ private final Item item;
+ private boolean cancel = false;
+
+ public EntityPickupItemEvent(final LivingEntity entity, final Item item) {
+ super(entity);
+ this.item = item;
+ }
+
+ /**
+ * Gets the Item picked up by the entity.
+ *
+ * @return Item
+ */
+ public Item getItem() {
+ return item;
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return cancel;
+ }
+
+ @Override
+ public void setCancelled(boolean cancel) {
+ this.cancel = cancel;
+ }
+
+ @Override
+ public HandlerList getHandlers() {
+ return handlers;
+ }
+
+ public static HandlerList getHandlerList() {
+ return handlers;
+ }
+}
--
2.13.1

4
Spigot-API-Patches/0058-Shoulder-Entities-Release-API.patch → Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch
View File

@ -1,4 +1,4 @@
From 6404a253627d07f4b1bb7be54371e459c6c8ad64 Mon Sep 17 00:00:00 2001 From 749b81ac44634b7b41a61d72bf05086b872c39c6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 15:04:51 -0400 Date: Sat, 17 Jun 2017 15:04:51 -0400
Subject: [PATCH] Shoulder Entities Release API Subject: [PATCH] Shoulder Entities Release API
@ -34,5 +34,5 @@ index 518aa2a9..3939d4af 100644
* Gets the entity currently perched on the left shoulder or null if no * Gets the entity currently perched on the left shoulder or null if no
* entity. * entity.
-- --
2.13.0 2.13.3

6
Spigot-API-Patches/0059-Profile-Lookup-Events.patch → Spigot-API-Patches/0058-Profile-Lookup-Events.patch
View File

@ -1,4 +1,4 @@
From 6621b1acfb0898fa33bd6d3461ebff382a569465 Mon Sep 17 00:00:00 2001 From 5385d2681d3cad437db365cbfa18673430f323e2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 16:30:44 -0400 Date: Sat, 17 Jun 2017 16:30:44 -0400
Subject: [PATCH] Profile Lookup Events Subject: [PATCH] Profile Lookup Events
@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
profiles that had to be looked up. profiles that had to be looked up.
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 862910e0..c2922a7b 100644 index 09fb3408..4ff0c6f2 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -60,6 +60,13 @@ @@ -60,6 +60,13 @@
@ -235,5 +235,5 @@ index 00000000..750b9334
+ } + }
+} +}
-- --
2.13.2 2.13.3

6
Spigot-API-Patches/0060-Entity-fromMobSpawner.patch → Spigot-API-Patches/0059-Entity-fromMobSpawner.patch
View File

@ -1,11 +1,11 @@
From e694e778d2f5ac074f8e76ae11fb181d762d8c32 Mon Sep 17 00:00:00 2001 From 65b1c1ecda7de3d1b4fa683bc9942ec93db9d31f Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500 Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner() Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index c86c1c5f..b3d59a39 100644 index c86c1c5f..57f62ae4 100644
--- a/src/main/java/org/bukkit/entity/Entity.java --- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -505,5 +505,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable { @@ -505,5 +505,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@ -22,5 +22,5 @@ index c86c1c5f..b3d59a39 100644
// Paper end // Paper end
} }
-- --
2.13.2.windows.1 2.13.3

4
Spigot-API-Patches/0061-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch → Spigot-API-Patches/0060-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
View File

@ -1,4 +1,4 @@
From fd17520035a7195a2314c1648f29ae84c1d9233b Mon Sep 17 00:00:00 2001 From 8aa765ebb7b4bb1ba7b65a662bff871d50f90422 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com> From: willies952002 <admin@domnian.com>
Date: Thu, 20 Jul 2017 18:05:36 -0400 Date: Thu, 20 Jul 2017 18:05:36 -0400
Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent
@ -33,5 +33,5 @@ index 3c38d857..84de3ce4 100644
+ +
} }
-- --
2.11.0 2.13.3

4
Spigot-API-Patches/0062-Improve-the-Saddle-API-for-Horses.patch → Spigot-API-Patches/0061-Improve-the-Saddle-API-for-Horses.patch
View File

@ -1,4 +1,4 @@
From 756079e8a09b2663c5969682a4afce4db5d74672 Mon Sep 17 00:00:00 2001 From 50ad728a3cfb0af96a191960a256d0288ffb22bf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 10 Dec 2016 16:12:48 -0500 Date: Sat, 10 Dec 2016 16:12:48 -0500
Subject: [PATCH] Improve the Saddle API for Horses Subject: [PATCH] Improve the Saddle API for Horses
@ -94,5 +94,5 @@ index 00000000..010dc364
+ void setSaddle(ItemStack stack); + void setSaddle(ItemStack stack);
+} +}
-- --
2.13.0 2.13.3

4
Spigot-API-Patches/0063-ensureServerConversions-API.patch → Spigot-API-Patches/0062-ensureServerConversions-API.patch
View File

@ -1,4 +1,4 @@
From 4b1f37248bc27055112cfa172fa773dca45fbb47 Mon Sep 17 00:00:00 2001 From d97890f63015395b9fcf7bc382686ddfe5f3e266 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400 Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] ensureServerConversions API Subject: [PATCH] ensureServerConversions API
@ -61,5 +61,5 @@ index 188ae6d7..6bb19b9d 100644
+ // Paper end + // Paper end
} }
-- --
2.13.0 2.13.3

4
Spigot-API-Patches/0064-Add-getI18NDisplayName-API.patch → Spigot-API-Patches/0063-Add-getI18NDisplayName-API.patch
View File

@ -1,4 +1,4 @@
From f7de0db935ac36012247b83c4576cf07317891fb Mon Sep 17 00:00:00 2001 From 7c28e3c2d2ebf454068b75f615be4feb5ebaeede Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400 Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] Add getI18NDisplayName API Subject: [PATCH] Add getI18NDisplayName API
@ -49,5 +49,5 @@ index 6bb19b9d..7a52da9b 100644
// Paper end // Paper end
} }
-- --
2.13.0 2.13.3

4
Spigot-API-Patches/0065-ProfileWhitelistVerifyEvent.patch → Spigot-API-Patches/0064-ProfileWhitelistVerifyEvent.patch
View File

@ -1,4 +1,4 @@
From e422959fbe06c2055a5089da77024835870a5662 Mon Sep 17 00:00:00 2001 From c814474d6c5d9c4d7142d141e6dabf3935a577cb Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 3 Jul 2017 18:11:34 -0500 Date: Mon, 3 Jul 2017 18:11:34 -0500
Subject: [PATCH] ProfileWhitelistVerifyEvent Subject: [PATCH] ProfileWhitelistVerifyEvent
@ -124,5 +124,5 @@ index 00000000..59b69b23
+ } + }
+} +}
-- --
2.13.0 2.13.3

20
Spigot-Server-Patches/0002-Paper-config-files.patch
View File

@ -1,4 +1,4 @@
From added675968cf0fad5fedb1761ef8ea5906c8235 Mon Sep 17 00:00:00 2001 From 23030933bd7a18768c7dca7736c225ac268c5e49 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 21:02:09 -0600 Date: Mon, 29 Feb 2016 21:02:09 -0600
Subject: [PATCH] Paper config files Subject: [PATCH] Paper config files
@ -352,10 +352,10 @@ index 2e72afae2..5e6a7b9e4 100644
DedicatedServer.LOGGER.info("Generating keypair"); DedicatedServer.LOGGER.info("Generating keypair");
this.a(MinecraftEncryption.b()); this.a(MinecraftEncryption.b());
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f5d387511..fd204ad7a 100644 index ecd67652d..5fe013e6b 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -127,6 +127,8 @@ public abstract class World implements IBlockAccess { @@ -128,6 +128,8 @@ public abstract class World implements IBlockAccess {
private int tickPosition; private int tickPosition;
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
@ -364,7 +364,7 @@ index f5d387511..fd204ad7a 100644
public final SpigotTimings.WorldTimingsHandler timings; // Spigot public final SpigotTimings.WorldTimingsHandler timings; // Spigot
private boolean guardEntityList; // Spigot private boolean guardEntityList; // Spigot
public static boolean haveWeSilencedAPhysicsCrash; public static boolean haveWeSilencedAPhysicsCrash;
@@ -149,6 +151,7 @@ public abstract class World implements IBlockAccess { @@ -150,6 +152,7 @@ public abstract class World implements IBlockAccess {
protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) { protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
@ -373,10 +373,10 @@ index f5d387511..fd204ad7a 100644
this.world = new CraftWorld((WorldServer) this, gen, env); this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e21fb9bd7..dd50d5c56 100644 index e0fa25bb2..3354bf65f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -691,6 +691,7 @@ public final class CraftServer implements Server { @@ -692,6 +692,7 @@ public final class CraftServer implements Server {
} }
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@ -384,7 +384,7 @@ index e21fb9bd7..dd50d5c56 100644
for (WorldServer world : console.worlds) { for (WorldServer world : console.worlds) {
world.worldData.setDifficulty(difficulty); world.worldData.setDifficulty(difficulty);
world.setSpawnFlags(monsters, animals); world.setSpawnFlags(monsters, animals);
@@ -706,6 +707,7 @@ public final class CraftServer implements Server { @@ -707,6 +708,7 @@ public final class CraftServer implements Server {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
} }
world.spigotConfig.init(); // Spigot world.spigotConfig.init(); // Spigot
@ -392,7 +392,7 @@ index e21fb9bd7..dd50d5c56 100644
} }
pluginManager.clearPlugins(); pluginManager.clearPlugins();
@@ -713,6 +715,7 @@ public final class CraftServer implements Server { @@ -714,6 +716,7 @@ public final class CraftServer implements Server {
resetRecipes(); resetRecipes();
reloadData(); reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot org.spigotmc.SpigotConfig.registerCommands(); // Spigot
@ -400,7 +400,7 @@ index e21fb9bd7..dd50d5c56 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
int pollCount = 0; int pollCount = 0;
@@ -1766,4 +1769,26 @@ public final class CraftServer implements Server { @@ -1776,4 +1779,26 @@ public final class CraftServer implements Server {
{ {
return spigot; return spigot;
} }
@ -488,5 +488,5 @@ index 01e73eb89..0b66f5e35 100644
config.addDefault( "world-settings.default." + path, def ); config.addDefault( "world-settings.default." + path, def );
return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) ); return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
-- --
2.13.3.windows.1 2.13.3

34
Spigot-Server-Patches/0006-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From 65851b50f65b8c5b3d50dc61fe0dbc5deb43eb53 Mon Sep 17 00:00:00 2001 From c78705e3ca96baa6fc5ab49a41410c834b571238 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600 Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -424,7 +424,7 @@ index 5ab2cf6ee..b5795b6d3 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 7501a1a28..1701804b1 100644 index ddc7a2931..785106dd8 100644
--- a/src/main/java/net/minecraft/server/Block.java --- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java
@@ -35,6 +35,15 @@ public class Block { @@ -35,6 +35,15 @@ public class Block {
@ -1159,7 +1159,7 @@ index 591f4ad7f..e02f0c442 100644
private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials(); private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
protected World world; protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index fd204ad7a..aaa524b3d 100644 index 5fe013e6b..ce2817d56 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -18,11 +18,11 @@ import com.google.common.collect.Maps; @@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@ -1175,7 +1175,7 @@ index fd204ad7a..aaa524b3d 100644
import org.bukkit.event.block.BlockCanBuildEvent; import org.bukkit.event.block.BlockCanBuildEvent;
import org.bukkit.event.block.BlockPhysicsEvent; import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -129,7 +129,7 @@ public abstract class World implements IBlockAccess { @@ -130,7 +130,7 @@ public abstract class World implements IBlockAccess {
public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
@ -1184,7 +1184,7 @@ index fd204ad7a..aaa524b3d 100644
private boolean guardEntityList; // Spigot private boolean guardEntityList; // Spigot
public static boolean haveWeSilencedAPhysicsCrash; public static boolean haveWeSilencedAPhysicsCrash;
public static String blockLocation; public static String blockLocation;
@@ -199,7 +199,7 @@ public abstract class World implements IBlockAccess { @@ -200,7 +200,7 @@ public abstract class World implements IBlockAccess {
}); });
this.getServer().addWorld(this.world); this.getServer().addWorld(this.world);
// CraftBukkit end // CraftBukkit end
@ -1193,7 +1193,7 @@ index fd204ad7a..aaa524b3d 100644
this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime); this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
} }
@@ -1384,6 +1384,7 @@ public abstract class World implements IBlockAccess { @@ -1385,6 +1385,7 @@ public abstract class World implements IBlockAccess {
} }
this.methodProfiler.c("remove"); this.methodProfiler.c("remove");
@ -1201,7 +1201,7 @@ index fd204ad7a..aaa524b3d 100644
this.entityList.removeAll(this.f); this.entityList.removeAll(this.f);
int j; int j;
@@ -1404,6 +1405,7 @@ public abstract class World implements IBlockAccess { @@ -1405,6 +1406,7 @@ public abstract class World implements IBlockAccess {
this.f.clear(); this.f.clear();
this.l(); this.l();
@ -1209,7 +1209,7 @@ index fd204ad7a..aaa524b3d 100644
this.methodProfiler.c("regular"); this.methodProfiler.c("regular");
CrashReportSystemDetails crashreportsystemdetails1; CrashReportSystemDetails crashreportsystemdetails1;
@@ -1413,6 +1415,7 @@ public abstract class World implements IBlockAccess { @@ -1414,6 +1416,7 @@ public abstract class World implements IBlockAccess {
timings.entityTick.startTiming(); // Spigot timings.entityTick.startTiming(); // Spigot
guardEntityList = true; // Spigot guardEntityList = true; // Spigot
// CraftBukkit start - Use field for loop variable // CraftBukkit start - Use field for loop variable
@ -1217,7 +1217,7 @@ index fd204ad7a..aaa524b3d 100644
int entitiesThisCycle = 0; int entitiesThisCycle = 0;
if (tickPosition < 0) tickPosition = 0; if (tickPosition < 0) tickPosition = 0;
for (entityLimiter.initTick(); for (entityLimiter.initTick();
@@ -1434,10 +1437,11 @@ public abstract class World implements IBlockAccess { @@ -1435,10 +1438,11 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.a("tick"); this.methodProfiler.a("tick");
if (!entity.dead && !(entity instanceof EntityPlayer)) { if (!entity.dead && !(entity instanceof EntityPlayer)) {
try { try {
@ -1231,7 +1231,7 @@ index fd204ad7a..aaa524b3d 100644
crashreport1 = CrashReport.a(throwable1, "Ticking entity"); crashreport1 = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails1 = crashreport1.a("Entity being ticked"); crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
entity.appendEntityCrashDetails(crashreportsystemdetails1); entity.appendEntityCrashDetails(crashreportsystemdetails1);
@@ -1570,6 +1574,7 @@ public abstract class World implements IBlockAccess { @@ -1571,6 +1575,7 @@ public abstract class World implements IBlockAccess {
} }
timings.tileEntityPending.stopTiming(); // Spigot timings.tileEntityPending.stopTiming(); // Spigot
@ -1239,7 +1239,7 @@ index fd204ad7a..aaa524b3d 100644
this.methodProfiler.b(); this.methodProfiler.b();
this.methodProfiler.b(); this.methodProfiler.b();
} }
@@ -1628,7 +1633,6 @@ public abstract class World implements IBlockAccess { @@ -1629,7 +1634,6 @@ public abstract class World implements IBlockAccess {
} }
// CraftBukkit end // CraftBukkit end
@ -1247,7 +1247,7 @@ index fd204ad7a..aaa524b3d 100644
entity.M = entity.locX; entity.M = entity.locX;
entity.N = entity.locY; entity.N = entity.locY;
entity.O = entity.locZ; entity.O = entity.locZ;
@@ -1636,6 +1640,7 @@ public abstract class World implements IBlockAccess { @@ -1637,6 +1641,7 @@ public abstract class World implements IBlockAccess {
entity.lastPitch = entity.pitch; entity.lastPitch = entity.pitch;
if (flag && entity.aa) { if (flag && entity.aa) {
++entity.ticksLived; ++entity.ticksLived;
@ -1255,7 +1255,7 @@ index fd204ad7a..aaa524b3d 100644
if (entity.isPassenger()) { if (entity.isPassenger()) {
entity.aE(); entity.aE();
} else { } else {
@@ -1695,8 +1700,6 @@ public abstract class World implements IBlockAccess { @@ -1696,8 +1701,6 @@ public abstract class World implements IBlockAccess {
} }
} }
} }
@ -1399,10 +1399,10 @@ index 8afe1d3d3..00b093976 100644
// CraftBukkit start // CraftBukkit start
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d7af2c00f..cfc1cb7de 100644 index 3354bf65f..8c9e26eb9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1739,6 +1739,7 @@ public final class CraftServer implements Server { @@ -1749,6 +1749,7 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot() private final Spigot spigot = new Spigot()
{ {
@ -1410,7 +1410,7 @@ index d7af2c00f..cfc1cb7de 100644
@Override @Override
public YamlConfiguration getConfig() public YamlConfiguration getConfig()
{ {
@@ -1746,6 +1747,24 @@ public final class CraftServer implements Server { @@ -1756,6 +1757,24 @@ public final class CraftServer implements Server {
} }
@Override @Override
@ -1918,5 +1918,5 @@ index 2bd690fdf..38be7ed71 100644
} }
} }
-- --
2.13.0 2.13.3

10
Spigot-Server-Patches/0011-Allow-nerfed-mobs-to-jump.patch
View File

@ -1,4 +1,4 @@
From c150eee4585914341d43d303c19c1d0e2461b21f Mon Sep 17 00:00:00 2001 From 97ddf652daa2df0abdac972daa33a2bc9c3d3e85 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 13:24:16 -0600 Date: Tue, 1 Mar 2016 13:24:16 -0600
Subject: [PATCH] Allow nerfed mobs to jump Subject: [PATCH] Allow nerfed mobs to jump
@ -31,10 +31,10 @@ index 4f2fa59ac..8af52a61f 100644
this.b.l(this.a); this.b.l(this.a);
this.a = false; this.a = false;
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 4c53aa0e9..882996572 100644 index 3c48d9463..7b02b253c 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
@@ -44,6 +44,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -46,6 +46,7 @@ public abstract class EntityInsentient extends EntityLiving {
private boolean bE; private boolean bE;
private Entity leashHolder; private Entity leashHolder;
private NBTTagCompound bG; private NBTTagCompound bG;
@ -42,7 +42,7 @@ index 4c53aa0e9..882996572 100644
public EntityInsentient(World world) { public EntityInsentient(World world) {
super(world); super(world);
@@ -641,6 +642,12 @@ public abstract class EntityInsentient extends EntityLiving { @@ -651,6 +652,12 @@ public abstract class EntityInsentient extends EntityLiving {
// Spigot Start // Spigot Start
if ( this.fromMobSpawner ) if ( this.fromMobSpawner )
{ {
@ -81,5 +81,5 @@ index b3b303b3b..fc8be86fd 100644
if (this.a.getRandom().nextFloat() < 0.8F) { if (this.a.getRandom().nextFloat() < 0.8F) {
this.a.getControllerJump().a(); this.a.getControllerJump().a();
-- --
2.13.1 2.13.3

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

@ -1,4 +1,4 @@
From 10fdbe916be252c01a51a6b68695eaa90e5619f1 Mon Sep 17 00:00:00 2001 From dca2ae19f2d3a3f260e74471a5a53d7a9b019b67 Mon Sep 17 00:00:00 2001
From: Suddenly <suddenly@suddenly.coffee> From: Suddenly <suddenly@suddenly.coffee>
Date: Tue, 1 Mar 2016 13:51:54 -0600 Date: Tue, 1 Mar 2016 13:51:54 -0600
Subject: [PATCH] Add configurable despawn distances for living entities Subject: [PATCH] Add configurable despawn distances for living entities
@ -30,10 +30,10 @@ index 5f13fbff3..4b64ccaa0 100644
+ } + }
} }
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 09e5408ac..be3422adc 100644 index 7b02b253c..94967e6b6 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
@@ -620,13 +620,13 @@ public abstract class EntityInsentient extends EntityLiving { @@ -630,13 +630,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;
@ -51,5 +51,5 @@ index 09e5408ac..be3422adc 100644
} }
} }
-- --
2.13.0 2.13.3

8
Spigot-Server-Patches/0013-Allow-for-toggling-of-spawn-chunks.patch
View File

@ -1,4 +1,4 @@
From 63f3013587dc1e8a42ed59e62d6b6bb5225a91dc Mon Sep 17 00:00:00 2001 From c1bf7c5cd01c139578159ce81394952191586a71 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 3 Mar 2016 03:53:43 -0600 Date: Thu, 3 Mar 2016 03:53:43 -0600
Subject: [PATCH] Allow for toggling of spawn chunks Subject: [PATCH] Allow for toggling of spawn chunks
@ -20,10 +20,10 @@ index 4b64ccaa0..7ac6a5f1f 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index eafb76003..1ff2263eb 100644 index ce2817d56..4f6c4fb7b 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -200,6 +200,7 @@ public abstract class World implements IBlockAccess { @@ -201,6 +201,7 @@ public abstract class World implements IBlockAccess {
this.getServer().addWorld(this.world); this.getServer().addWorld(this.world);
// CraftBukkit end // CraftBukkit end
timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
@ -32,5 +32,5 @@ index eafb76003..1ff2263eb 100644
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
} }
-- --
2.13.0 2.13.3

8
Spigot-Server-Patches/0016-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
View File

@ -1,4 +1,4 @@
From 53c72b748355d71cd710ab2fabc6758c55f1f792 Mon Sep 17 00:00:00 2001 From 4fbd5c4b6bb219d75c8b5b2e87771cfab5d5c59a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 14:32:43 -0600 Date: Tue, 1 Mar 2016 14:32:43 -0600
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@ -33,10 +33,10 @@ index 43b4e552b..024218a1d 100644
public CrashReport b(CrashReport crashreport) { public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5c05ae407..bfc42b12f 100644 index 8c9e26eb9..f17e36e7e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -136,7 +136,7 @@ import net.md_5.bungee.api.chat.BaseComponent; @@ -137,7 +137,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
public final class CraftServer implements Server { public final class CraftServer implements Server {
private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0]; private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
@ -93,5 +93,5 @@ index 94a3d4237..3ed983cc0 100644
log.log( Level.SEVERE, "------------------------------" ); log.log( Level.SEVERE, "------------------------------" );
// //
-- --
2.13.2 2.13.3

12
Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
View File

@ -1,4 +1,4 @@
From f77708a67bce0f76232043c1b3885946578d938b Mon Sep 17 00:00:00 2001 From 0cd969d1027bf2228f03779bc726a8710169ccc6 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600 Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API Subject: [PATCH] Player affects spawning API
@ -17,10 +17,10 @@ index b8479d9cf..e9509e618 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 971267b32..1429beb59 100644 index 94967e6b6..5ea9f3097 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
@@ -614,7 +614,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -624,7 +624,7 @@ public abstract class EntityInsentient extends EntityLiving {
} else { } else {
EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D); EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
@ -57,10 +57,10 @@ index a599a043d..1c7c187c7 100644
j = MathHelper.floor(entityhuman.locZ / 16.0D); j = MathHelper.floor(entityhuman.locZ / 16.0D);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d6d8cd90e..9e505cce4 100644 index 4f6c4fb7b..769e381fe 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -2735,7 +2735,7 @@ public abstract class World implements IBlockAccess { @@ -2736,7 +2736,7 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < this.players.size(); ++i) { for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i); EntityHuman entityhuman = (EntityHuman) this.players.get(i);
@ -91,5 +91,5 @@ index d38900887..939233ef7 100644
// Spigot start // Spigot start
-- --
2.13.3.windows.1 2.13.3

8
Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
View File

@ -1,4 +1,4 @@
From 8c888242a7034cab540e1a03ecf5aec57e0d0a20 Mon Sep 17 00:00:00 2001 From 179493c3ee21a683630fa32e0ecc9d43c2664ae5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 1 Mar 2016 23:09:29 -0600 Date: Tue, 1 Mar 2016 23:09:29 -0600
Subject: [PATCH] Further improve server tick loop Subject: [PATCH] Further improve server tick loop
@ -147,10 +147,10 @@ index 024218a1d..9d2f3b834 100644
} }
lastTick = curTime; lastTick = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d3639ad55..8f7ccf35a 100644 index f17e36e7e..24fcdd382 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1736,6 +1736,17 @@ public final class CraftServer implements Server { @@ -1746,6 +1746,17 @@ public final class CraftServer implements Server {
return CraftMagicNumbers.INSTANCE; return CraftMagicNumbers.INSTANCE;
} }
@ -210,5 +210,5 @@ index be2e31dea..6d21c3269 100644
return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
+ ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
-- --
2.13.0 2.13.3

10
Spigot-Server-Patches/0023-Entity-Origin-API.patch
View File

@ -1,11 +1,11 @@
From 3a836d77d00379939ad86b3f37f2add7368aca7a Mon Sep 17 00:00:00 2001 From 51975ee1cc2b9540929b648cf46169452d020bd2 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Tue, 1 Mar 2016 23:45:08 -0600 Date: Tue, 1 Mar 2016 23:45:08 -0600
Subject: [PATCH] Entity Origin API Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 769675745..d3e8d1038 100644 index d1c40b298..a6a5f73f5 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -148,6 +148,7 @@ public abstract class Entity implements ICommandListener { @@ -148,6 +148,7 @@ public abstract class Entity implements ICommandListener {
@ -101,10 +101,10 @@ index bc6383669..ca9eb2f3b 100644
if (i >= 0 && i < this.list.size()) { if (i >= 0 && i < this.list.size()) {
NBTBase nbtbase = (NBTBase) this.list.get(i); NBTBase nbtbase = (NBTBase) this.list.get(i);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ab3d6e484..2695cff93 100644 index 769e381fe..71882a169 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1023,6 +1023,12 @@ public abstract class World implements IBlockAccess { @@ -1024,6 +1024,12 @@ public abstract class World implements IBlockAccess {
int j = MathHelper.floor(entity.locZ / 16.0D); int j = MathHelper.floor(entity.locZ / 16.0D);
boolean flag = entity.attachedToPlayer; boolean flag = entity.attachedToPlayer;
@ -135,5 +135,5 @@ index dc6a6b37b..d12278a52 100644
+ // Paper end + // Paper end
} }
-- --
2.13.0.windows.1 2.13.3

12
Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
View File

@ -1,11 +1,11 @@
From 42fd2bd1fed5b2bc5acf04ea956e6b474ca1b6f6 Mon Sep 17 00:00:00 2001 From 6bc4e40f63d1e5ba09ffbecfe918b14afcd84932 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 1 Mar 2016 23:52:34 -0600 Date: Tue, 1 Mar 2016 23:52:34 -0600
Subject: [PATCH] Prevent tile entity and entity crashes Subject: [PATCH] Prevent tile entity and entity crashes
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index e02f0c44..39be107f 100644 index e02f0c442..39be107fd 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java --- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -175,7 +175,12 @@ public abstract class TileEntity { @@ -175,7 +175,12 @@ public abstract class TileEntity {
@ -23,10 +23,10 @@ index e02f0c44..39be107f 100644
public String a() throws Exception { public String a() throws Exception {
int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock()); int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7646e824..ebc05bd0 100644 index 71882a169..6a46e1f79 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1449,10 +1449,12 @@ public abstract class World implements IBlockAccess { @@ -1450,10 +1450,12 @@ public abstract class World implements IBlockAccess {
entity.tickTimer.stopTiming(); // Paper entity.tickTimer.stopTiming(); // Paper
} catch (Throwable throwable1) { } catch (Throwable throwable1) {
entity.tickTimer.stopTiming(); entity.tickTimer.stopTiming();
@ -43,7 +43,7 @@ index 7646e824..ebc05bd0 100644
} }
} }
@@ -1515,10 +1517,13 @@ public abstract class World implements IBlockAccess { @@ -1516,10 +1518,13 @@ public abstract class World implements IBlockAccess {
((ITickable) tileentity).e(); ((ITickable) tileentity).e();
this.methodProfiler.b(); this.methodProfiler.b();
} catch (Throwable throwable2) { } catch (Throwable throwable2) {
@ -62,5 +62,5 @@ index 7646e824..ebc05bd0 100644
// Spigot start // Spigot start
finally { finally {
-- --
2.13.1.windows.2 2.13.3

12
Spigot-Server-Patches/0028-Lighting-Queue.patch
View File

@ -1,4 +1,4 @@
From aeebe23ba3a84e1939ee2919198c8ee307b63ce6 Mon Sep 17 00:00:00 2001 From 2ca7feba7bc12128f31ae48a356203e098f1624f Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 00:52:31 -0600 Date: Wed, 2 Mar 2016 00:52:31 -0600
Subject: [PATCH] Lighting Queue Subject: [PATCH] Lighting Queue
@ -42,7 +42,7 @@ index e524a464f..fd606ee14 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index e55aa73e9..972654790 100644 index a4b7d0176..6def9debe 100644
--- a/src/main/java/net/minecraft/server/Chunk.java --- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -33,6 +33,7 @@ public class Chunk { @@ -33,6 +33,7 @@ public class Chunk {
@ -97,7 +97,7 @@ index c1b0d6cea..ba720204d 100644
// Update neighbor counts // Update neighbor counts
for (int x = -2; x < 3; x++) { for (int x = -2; x < 3; x++) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 995542ab9..43ec2d9dc 100644 index 9d2f3b834..9c65c2949 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -721,7 +721,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -721,7 +721,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -225,10 +225,10 @@ index 000000000..d8d3e1efd
+ } + }
+} +}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b1addedeb..5d039f049 100644 index 6a46e1f79..b41061656 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -389,7 +389,7 @@ public abstract class World implements IBlockAccess { @@ -390,7 +390,7 @@ public abstract class World implements IBlockAccess {
} else { } else {
if (iblockdata.c() != iblockdata1.c() || iblockdata.d() != iblockdata1.d()) { if (iblockdata.c() != iblockdata1.c() || iblockdata.d() != iblockdata1.d()) {
this.methodProfiler.a("checkLight"); this.methodProfiler.a("checkLight");
@ -238,5 +238,5 @@ index b1addedeb..5d039f049 100644
} }
-- --
2.13.0 2.13.3

12
Spigot-Server-Patches/0032-Optimize-explosions.patch
View File

@ -1,4 +1,4 @@
From c0220cd1bc53c8ddbdc7a4574dcef456037ce806 Mon Sep 17 00:00:00 2001 From c8b6c8a0c2475c35a694ea746f3a7702f8aaf3de Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 11:59:48 -0600 Date: Wed, 2 Mar 2016 11:59:48 -0600
Subject: [PATCH] Optimize explosions Subject: [PATCH] Optimize explosions
@ -25,7 +25,7 @@ index 3b19b53a8..a7dfd2af7 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index bb5345a1a..63b70d60c 100644 index a1ebcf858..e7f0e84d4 100644
--- a/src/main/java/net/minecraft/server/Explosion.java --- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -130,7 +130,7 @@ public class Explosion { @@ -130,7 +130,7 @@ public class Explosion {
@ -124,7 +124,7 @@ index bb5345a1a..63b70d60c 100644
+ // Paper end + // Paper end
} }
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 43ec2d9dc..ecdb92397 100644 index 9c65c2949..6e11ba5b6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -886,6 +886,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -886,6 +886,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -136,7 +136,7 @@ index 43ec2d9dc..ecdb92397 100644
// this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit // this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5d039f049..dfd6c8a3d 100644 index b41061656..7de1cd31c 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -15,6 +15,7 @@ import javax.annotation.Nullable; @@ -15,6 +15,7 @@ import javax.annotation.Nullable;
@ -147,7 +147,7 @@ index 5d039f049..dfd6c8a3d 100644
import java.util.Map; import java.util.Map;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
@@ -136,6 +137,7 @@ public abstract class World implements IBlockAccess { @@ -137,6 +138,7 @@ public abstract class World implements IBlockAccess {
private org.spigotmc.TickLimiter entityLimiter; private org.spigotmc.TickLimiter entityLimiter;
private org.spigotmc.TickLimiter tileLimiter; private org.spigotmc.TickLimiter tileLimiter;
private int tileTickPosition; private int tileTickPosition;
@ -156,5 +156,5 @@ index 5d039f049..dfd6c8a3d 100644
public CraftWorld getWorld() { public CraftWorld getWorld() {
return this.world; return this.world;
-- --
2.13.0 2.13.3

10
Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
View File

@ -1,14 +1,14 @@
From d28719016c7ff39807739c19c979f752698fb830 Mon Sep 17 00:00:00 2001 From bf725c1a56036f1b365db11682d992852beafefa Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 23:45:17 -0600 Date: Wed, 2 Mar 2016 23:45:17 -0600
Subject: [PATCH] Disable spigot tick limiters Subject: [PATCH] Disable spigot tick limiters
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9bc1b7a4..c284a804 100644 index 7de1cd31c..9c7675996 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1426,10 +1426,10 @@ public abstract class World implements IBlockAccess { @@ -1427,10 +1427,10 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - Use field for loop variable // CraftBukkit start - Use field for loop variable
co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper
int entitiesThisCycle = 0; int entitiesThisCycle = 0;
@ -23,7 +23,7 @@ index 9bc1b7a4..c284a804 100644
tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0; tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
entity = (Entity) this.entityList.get(this.tickPosition); entity = (Entity) this.entityList.get(this.tickPosition);
// CraftBukkit end // CraftBukkit end
@@ -1495,9 +1495,7 @@ public abstract class World implements IBlockAccess { @@ -1496,9 +1496,7 @@ public abstract class World implements IBlockAccess {
// Spigot start // Spigot start
// Iterator iterator = this.tileEntityListTick.iterator(); // Iterator iterator = this.tileEntityListTick.iterator();
int tilesThisCycle = 0; int tilesThisCycle = 0;
@ -35,5 +35,5 @@ index 9bc1b7a4..c284a804 100644
TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition); TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
// Spigot start // Spigot start
-- --
2.13.1.windows.2 2.13.3

8
Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
View File

@ -1,4 +1,4 @@
From 295a47e34d028c1f71cb41b34004e596890464fa Mon Sep 17 00:00:00 2001 From dd43dc2776791cc32d13c13c3b41b69e1338a194 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 01:17:12 -0600 Date: Thu, 3 Mar 2016 01:17:12 -0600
Subject: [PATCH] Ensure commands are not ran async Subject: [PATCH] Ensure commands are not ran async
@ -48,10 +48,10 @@ index f7326aeec..cd88ae7b7 100644
} else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) { } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
// Do nothing, this is coming from a plugin // Do nothing, this is coming from a plugin
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8f7ccf35a..1090ee35e 100644 index 24fcdd382..f28471901 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -637,6 +637,29 @@ public final class CraftServer implements Server { @@ -638,6 +638,29 @@ public final class CraftServer implements Server {
Validate.notNull(sender, "Sender cannot be null"); Validate.notNull(sender, "Sender cannot be null");
Validate.notNull(commandLine, "CommandLine cannot be null"); Validate.notNull(commandLine, "CommandLine cannot be null");
@ -82,5 +82,5 @@ index 8f7ccf35a..1090ee35e 100644
return true; return true;
} }
-- --
2.13.0 2.13.3

8
Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
View File

@ -1,14 +1,14 @@
From 9c9ce99fe37dfa1dce089637e821156ca4d68f37 Mon Sep 17 00:00:00 2001 From 4155fd5b7a8c302eb6e607c8ec0240d34ec46d03 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:15:57 -0600 Date: Thu, 3 Mar 2016 02:15:57 -0600
Subject: [PATCH] Expose server CommandMap Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1090ee35e..5055ab6d3 100644 index f28471901..7c2bb6d01 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1547,6 +1547,7 @@ public final class CraftServer implements Server { @@ -1557,6 +1557,7 @@ public final class CraftServer implements Server {
return helpMap; return helpMap;
} }
@ -17,5 +17,5 @@ index 1090ee35e..5055ab6d3 100644
return commandMap; return commandMap;
} }
-- --
2.13.0 2.13.3

10
Spigot-Server-Patches/0057-Change-implementation-of-tile-entity-removal-list.patch
View File

@ -1,11 +1,11 @@
From e7e5b63d3adfe0c2a9b034106962374272746b26 Mon Sep 17 00:00:00 2001 From 93d284c42ac17c1442ce4610dea85261ea91c46c Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:39:54 -0600 Date: Thu, 3 Mar 2016 02:39:54 -0600
Subject: [PATCH] Change implementation of (tile)entity removal list Subject: [PATCH] Change implementation of (tile)entity removal list
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ff62a44b..3fdf091c 100644 index e8daa9d9d..d41d1103e 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -122,10 +122,10 @@ public abstract class Entity implements ICommandListener { @@ -122,10 +122,10 @@ public abstract class Entity implements ICommandListener {
@ -24,7 +24,7 @@ index ff62a44b..3fdf091c 100644
public boolean impulse; public boolean impulse;
public int portalCooldown; public int portalCooldown;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c284a804..8334f2a1 100644 index 9c7675996..307ef6dff 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; @@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@ -53,7 +53,7 @@ index c284a804..8334f2a1 100644
public final List<EntityHuman> players = Lists.newArrayList(); public final List<EntityHuman> players = Lists.newArrayList();
public final List<Entity> j = Lists.newArrayList(); public final List<Entity> j = Lists.newArrayList();
protected final IntHashMap<Entity> entitiesById = new IntHashMap(); protected final IntHashMap<Entity> entitiesById = new IntHashMap();
@@ -1397,20 +1402,20 @@ public abstract class World implements IBlockAccess { @@ -1398,20 +1403,20 @@ public abstract class World implements IBlockAccess {
this.entityList.removeAll(this.f); this.entityList.removeAll(this.f);
int j; int j;
@ -84,5 +84,5 @@ index c284a804..8334f2a1 100644
this.f.clear(); this.f.clear();
this.l(); this.l();
-- --
2.13.1.windows.2 2.13.3

8
Spigot-Server-Patches/0059-Add-velocity-warnings.patch
View File

@ -1,14 +1,14 @@
From 270f6a315741856dbbd5d1c9f41ea303c635fcf2 Mon Sep 17 00:00:00 2001 From 4054c255ab9374fcf130f546651e7dbf38cbd472 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:48:12 -0600 Date: Thu, 3 Mar 2016 02:48:12 -0600
Subject: [PATCH] Add velocity warnings Subject: [PATCH] Add velocity warnings
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1381d234e..00208ff45 100644 index 7c2bb6d01..491d6ef7c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -174,6 +174,7 @@ public final class CraftServer implements Server { @@ -175,6 +175,7 @@ public final class CraftServer implements Server {
private final UUID invalidUserUUID = UUID.nameUUIDFromBytes("InvalidUsername".getBytes(Charsets.UTF_8)); private final UUID invalidUserUUID = UUID.nameUUIDFromBytes("InvalidUsername".getBytes(Charsets.UTF_8));
private final List<CraftPlayer> playerView; private final List<CraftPlayer> playerView;
public int reloadCount; public int reloadCount;
@ -91,5 +91,5 @@ index 3ed983cc0..6384d50e7 100644
log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log ); dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
-- --
2.13.0.windows.1 2.13.3

30
Spigot-Server-Patches/0061-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From 6782f2b68e7c40b5b6e9446545d9ee37a4c25ae9 Mon Sep 17 00:00:00 2001 From fa59fa6c49d99b9e50bff39d8dae5ec6cfb62a68 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io> From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 03:15:41 -0600 Date: Thu, 3 Mar 2016 03:15:41 -0600
Subject: [PATCH] Add exception reporting event Subject: [PATCH] Add exception reporting event
@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
new file mode 100644 new file mode 100644
index 00000000..93397188 index 000000000..93397188b
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
@ -50,7 +50,7 @@ index 00000000..93397188
+} +}
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index c8e52eab..33737af7 100644 index c8e52eab1..33737af78 100644
--- a/src/main/java/net/minecraft/server/Chunk.java --- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
@ -89,7 +89,7 @@ index c8e52eab..33737af7 100644
} }
} }
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index ba720204..9449b645 100644 index ba720204d..9449b645d 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -12,6 +12,7 @@ import java.util.Iterator; @@ -12,6 +12,7 @@ import java.util.Iterator;
@ -144,7 +144,7 @@ index ba720204..9449b645 100644
} }
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
index 83322b85..b943a9b2 100644 index 83322b85b..b943a9b20 100644
--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
@ -172,7 +172,7 @@ index 83322b85..b943a9b2 100644
} }
// CraftBukkit end // CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java diff --git a/src/main/java/net/minecraft/server/PersistentCollection.java b/src/main/java/net/minecraft/server/PersistentCollection.java
index 936d6c64..50056f49 100644 index 936d6c640..50056f49a 100644
--- a/src/main/java/net/minecraft/server/PersistentCollection.java --- a/src/main/java/net/minecraft/server/PersistentCollection.java
+++ b/src/main/java/net/minecraft/server/PersistentCollection.java +++ b/src/main/java/net/minecraft/server/PersistentCollection.java
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
@ -199,7 +199,7 @@ index 936d6c64..50056f49 100644
} }
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
index 1ba26de5..6a92b5af 100644 index 1ba26de5c..6a92b5af8 100644
--- a/src/main/java/net/minecraft/server/RegionFile.java --- a/src/main/java/net/minecraft/server/RegionFile.java
+++ b/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
@ -226,7 +226,7 @@ index 1ba26de5..6a92b5af 100644
} }
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index c15a0d1f..5f9e9dde 100644 index c15a0d1f8..5f9e9ddef 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java --- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
@ -245,7 +245,7 @@ index c15a0d1f..5f9e9dde 100644
} }
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 1c7c187c..68a04532 100644 index 1c7c187c7..68a045323 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -7,6 +7,7 @@ import java.util.Random; @@ -7,6 +7,7 @@ import java.util.Random;
@ -273,7 +273,7 @@ index 1c7c187c..68a04532 100644
} }
diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
index 9ff4f23a..6fce3015 100644 index 9ff4f23ab..6fce3015f 100644
--- a/src/main/java/net/minecraft/server/VillageSiege.java --- a/src/main/java/net/minecraft/server/VillageSiege.java
+++ b/src/main/java/net/minecraft/server/VillageSiege.java +++ b/src/main/java/net/minecraft/server/VillageSiege.java
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
@ -293,7 +293,7 @@ index 9ff4f23a..6fce3015 100644
} }
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 8334f2a1..86091eba 100644 index 307ef6dff..e175d2891 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
@ -304,7 +304,7 @@ index 8334f2a1..86091eba 100644
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
@@ -1457,8 +1459,10 @@ public abstract class World implements IBlockAccess { @@ -1458,8 +1460,10 @@ public abstract class World implements IBlockAccess {
} catch (Throwable throwable1) { } catch (Throwable throwable1) {
entity.tickTimer.stopTiming(); entity.tickTimer.stopTiming();
// Paper start - Prevent tile entity and entity crashes // Paper start - Prevent tile entity and entity crashes
@ -316,7 +316,7 @@ index 8334f2a1..86091eba 100644
entity.dead = true; entity.dead = true;
continue; continue;
// Paper end // Paper end
@@ -1523,8 +1527,10 @@ public abstract class World implements IBlockAccess { @@ -1524,8 +1528,10 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.b(); this.methodProfiler.b();
} catch (Throwable throwable2) { } catch (Throwable throwable2) {
// Paper start - Prevent tile entity and entity crashes // Paper start - Prevent tile entity and entity crashes
@ -329,7 +329,7 @@ index 8334f2a1..86091eba 100644
this.tileEntityListTick.remove(tileTickPosition--); this.tileEntityListTick.remove(tileTickPosition--);
continue; continue;
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 9952b64b..e30cfb7b 100644 index 19adb77b5..b9d93a01f 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -15,6 +15,9 @@ import java.util.concurrent.atomic.AtomicReference; @@ -15,6 +15,9 @@ import java.util.concurrent.atomic.AtomicReference;
@ -373,5 +373,5 @@ index 9952b64b..e30cfb7b 100644
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
} }
-- --
2.13.1.windows.2 2.13.3

10
Spigot-Server-Patches/0068-Default-loading-permissions.yml-before-plugins.patch
View File

@ -1,4 +1,4 @@
From 929d344cb479d2127646408e37a798243f8d65c0 Mon Sep 17 00:00:00 2001 From cc980dd4551c6a8f673c7bc520ed6b6b3bd83ee7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:17:38 -0400 Date: Fri, 18 Mar 2016 13:17:38 -0400
Subject: [PATCH] Default loading permissions.yml before plugins Subject: [PATCH] Default loading permissions.yml before plugins
@ -30,10 +30,10 @@ index 3898ad8fa..2f6e169f5 100644
+ } + }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6c6a0854d..815a26284 100644 index 491d6ef7c..d8b01145f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -314,6 +314,7 @@ public final class CraftServer implements Server { @@ -315,6 +315,7 @@ public final class CraftServer implements Server {
if (type == PluginLoadOrder.STARTUP) { if (type == PluginLoadOrder.STARTUP) {
helpMap.clear(); helpMap.clear();
helpMap.initializeGeneralTopics(); helpMap.initializeGeneralTopics();
@ -41,7 +41,7 @@ index 6c6a0854d..815a26284 100644
} }
Plugin[] plugins = pluginManager.getPlugins(); Plugin[] plugins = pluginManager.getPlugins();
@@ -331,7 +332,7 @@ public final class CraftServer implements Server { @@ -332,7 +333,7 @@ public final class CraftServer implements Server {
setVanillaCommands(false); setVanillaCommands(false);
// Spigot end // Spigot end
commandMap.registerServerAliases(); commandMap.registerServerAliases();
@ -51,5 +51,5 @@ index 6c6a0854d..815a26284 100644
CraftDefaultPermissions.registerCorePermissions(); CraftDefaultPermissions.registerCorePermissions();
helpMap.initializeCommands(); helpMap.initializeCommands();
-- --
2.13.0 2.13.3

8
Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
View File

@ -1,4 +1,4 @@
From 12270cc7b873df6ca91f3342c83b225c60124ef1 Mon Sep 17 00:00:00 2001 From 874067837c16fd8ccd4b7d84d8002a95f1c3b70f Mon Sep 17 00:00:00 2001
From: William <admin@domnian.com> From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:30:17 -0400 Date: Fri, 18 Mar 2016 03:30:17 -0400
Subject: [PATCH] Allow Reloading of Custom Permissions Subject: [PATCH] Allow Reloading of Custom Permissions
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
https://github.com/PaperMC/Paper/issues/49 https://github.com/PaperMC/Paper/issues/49
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3007a724b..e8b8e86e8 100644 index d8b01145f..43348d56c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1846,5 +1846,20 @@ public final class CraftServer implements Server { @@ -1856,5 +1856,20 @@ public final class CraftServer implements Server {
return false; return false;
} }
} }
@ -31,5 +31,5 @@ index 3007a724b..e8b8e86e8 100644
// Paper end // Paper end
} }
-- --
2.13.3.windows.1 2.13.3

8
Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
View File

@ -1,4 +1,4 @@
From 0072a8440198f525270b4ab091319daa204087cc Mon Sep 17 00:00:00 2001 From cd8468c6aaa9547eb65d947e6ce8eebb67633cd1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:50:14 -0400 Date: Fri, 18 Mar 2016 13:50:14 -0400
Subject: [PATCH] Remove Metadata on reload Subject: [PATCH] Remove Metadata on reload
@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive
This will remove metadata on reload so it does not crash everything if a plugin uses it. This will remove metadata on reload so it does not crash everything if a plugin uses it.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7a2c19159..0f7c67256 100644 index 43348d56c..c48e5f12c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -735,8 +735,18 @@ public final class CraftServer implements Server { @@ -736,8 +736,18 @@ public final class CraftServer implements Server {
world.paperConfig.init(); // Paper world.paperConfig.init(); // Paper
} }
@ -30,5 +30,5 @@ index 7a2c19159..0f7c67256 100644
reloadData(); reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot org.spigotmc.SpigotConfig.registerCommands(); // Spigot
-- --
2.13.0 2.13.3

14
Spigot-Server-Patches/0075-Add-World-Util-Methods.patch
View File

@ -1,4 +1,4 @@
From 0a7c4b8b28a8d72061bbfc35c2aeb0a9bc05674f Mon Sep 17 00:00:00 2001 From 05f72559e6fec57fb264f1ce6cd8d8e148e6b1ae Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 20:16:03 -0400 Date: Fri, 18 Mar 2016 20:16:03 -0400
Subject: [PATCH] Add World Util Methods Subject: [PATCH] Add World Util Methods
@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
Methods that can be used for other patches to help improve logic. Methods that can be used for other patches to help improve logic.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 491278646..c0d6e056d 100644 index 33737af78..1a77dfe4e 100644
--- a/src/main/java/net/minecraft/server/Chunk.java --- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -580,6 +580,7 @@ public class Chunk { @@ -580,6 +580,7 @@ public class Chunk {
@ -18,7 +18,7 @@ index 491278646..c0d6e056d 100644
int j = blockposition.getX() & 15; int j = blockposition.getX() & 15;
int k = blockposition.getY(); int k = blockposition.getY();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1fc7ec6f4..20bdf4055 100644 index e175d2891..0ece629d8 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -76,7 +76,7 @@ public abstract class World implements IBlockAccess { @@ -76,7 +76,7 @@ public abstract class World implements IBlockAccess {
@ -30,7 +30,7 @@ index 1fc7ec6f4..20bdf4055 100644
protected int l = (new Random()).nextInt(); protected int l = (new Random()).nextInt();
protected final int m = 1013904223; protected final int m = 1013904223;
protected float n; protected float n;
@@ -154,6 +154,12 @@ public abstract class World implements IBlockAccess { @@ -155,6 +155,12 @@ public abstract class World implements IBlockAccess {
return (CraftServer) Bukkit.getServer(); return (CraftServer) Bukkit.getServer();
} }
@ -43,7 +43,7 @@ index 1fc7ec6f4..20bdf4055 100644
public Chunk getChunkIfLoaded(int x, int z) { public Chunk getChunkIfLoaded(int x, int z) {
return ((ChunkProviderServer) this.chunkProvider).getChunkIfLoaded(x, z); return ((ChunkProviderServer) this.chunkProvider).getChunkIfLoaded(x, z);
} }
@@ -684,10 +690,46 @@ public abstract class World implements IBlockAccess { @@ -685,10 +691,46 @@ public abstract class World implements IBlockAccess {
} }
} }
@ -90,7 +90,7 @@ index 1fc7ec6f4..20bdf4055 100644
public int c(BlockPosition blockposition, boolean flag) { public int c(BlockPosition blockposition, boolean flag) {
if (blockposition.getX() >= -30000000 && blockposition.getZ() >= -30000000 && blockposition.getX() < 30000000 && blockposition.getZ() < 30000000) { if (blockposition.getX() >= -30000000 && blockposition.getZ() >= -30000000 && blockposition.getX() < 30000000 && blockposition.getZ() < 30000000) {
if (flag && this.getType(blockposition).f()) { if (flag && this.getType(blockposition).f()) {
@@ -803,6 +845,27 @@ public abstract class World implements IBlockAccess { @@ -804,6 +846,27 @@ public abstract class World implements IBlockAccess {
return this.worldProvider.o()[this.getLightLevel(blockposition)]; return this.worldProvider.o()[this.getLightLevel(blockposition)];
} }
@ -119,5 +119,5 @@ index 1fc7ec6f4..20bdf4055 100644
// CraftBukkit start - tree generation // CraftBukkit start - tree generation
if (captureTreeGeneration) { if (captureTreeGeneration) {
-- --
2.13.0 2.13.3

34
Spigot-Server-Patches/0087-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
View File

@ -1,4 +1,4 @@
From ca23836db78750c49d8181f831f91eb1507ad0b1 Mon Sep 17 00:00:00 2001 From e58268a1743bb0ccfeea7b53d56e0b2597ae5767 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:07:55 -0600 Date: Thu, 3 Mar 2016 02:07:55 -0600
Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward.
Optimize getType and getBlockData to manually inline and optimize the calls Optimize getType and getBlockData to manually inline and optimize the calls
diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
index d55e180d..679d5504 100644 index d55e180d7..679d5504e 100644
--- a/src/main/java/net/minecraft/server/BaseBlockPosition.java --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
+++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
@@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> { @@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@ -31,7 +31,7 @@ index d55e180d..679d5504 100644
public BaseBlockPosition(int i, int j, int k) { public BaseBlockPosition(int i, int j, int k) {
this.a = i; this.a = i;
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index 67b476b2..008ed206 100644 index 67b476b22..008ed206d 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java --- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition { @@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition {
@ -52,7 +52,7 @@ index 67b476b2..008ed206 100644
public MutableBlockPosition() { public MutableBlockPosition() {
this(0, 0, 0); this(0, 0, 0);
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 1a77dfe4..7eb8deb2 100644 index 1a77dfe4e..7eb8deb2c 100644
--- a/src/main/java/net/minecraft/server/Chunk.java --- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -406,11 +406,27 @@ public class Chunk { @@ -406,11 +406,27 @@ public class Chunk {
@ -86,7 +86,7 @@ index 1a77dfe4..7eb8deb2 100644
IBlockData iblockdata = null; IBlockData iblockdata = null;
diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
index 3d784d0d..afdc4a77 100644 index 3d784d0dc..afdc4a779 100644
--- a/src/main/java/net/minecraft/server/ChunkSection.java --- a/src/main/java/net/minecraft/server/ChunkSection.java
+++ b/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -5,7 +5,7 @@ public class ChunkSection { @@ -5,7 +5,7 @@ public class ChunkSection {
@ -99,10 +99,10 @@ index 3d784d0d..afdc4a77 100644
private NibbleArray skyLight; private NibbleArray skyLight;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 90229072..e19066ae 100644 index 0ece629d8..68845fc64 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -275,12 +275,12 @@ public abstract class World implements IBlockAccess { @@ -276,12 +276,12 @@ public abstract class World implements IBlockAccess {
return this.getType(blockposition1); return this.getType(blockposition1);
} }
@ -119,7 +119,7 @@ index 90229072..e19066ae 100644
} }
public boolean isEmpty(BlockPosition blockposition) { public boolean isEmpty(BlockPosition blockposition) {
@@ -376,7 +376,7 @@ public abstract class World implements IBlockAccess { @@ -377,7 +377,7 @@ public abstract class World implements IBlockAccess {
return true; return true;
} }
// CraftBukkit end // CraftBukkit end
@ -128,7 +128,7 @@ index 90229072..e19066ae 100644
return false; return false;
} else if (!this.isClientSide && this.worldData.getType() == WorldType.DEBUG_ALL_BLOCK_STATES) { } else if (!this.isClientSide && this.worldData.getType() == WorldType.DEBUG_ALL_BLOCK_STATES) {
return false; return false;
@@ -693,7 +693,7 @@ public abstract class World implements IBlockAccess { @@ -694,7 +694,7 @@ public abstract class World implements IBlockAccess {
// Paper start - test if meets light level, return faster // Paper start - test if meets light level, return faster
// logic copied from below // logic copied from below
public boolean isLightLevel(BlockPosition blockposition, int level) { public boolean isLightLevel(BlockPosition blockposition, int level) {
@ -137,7 +137,7 @@ index 90229072..e19066ae 100644
if (this.getType(blockposition).f()) { if (this.getType(blockposition).f()) {
if (this.c(blockposition.up(), false) >= level) { if (this.c(blockposition.up(), false) >= level) {
return true; return true;
@@ -812,7 +812,7 @@ public abstract class World implements IBlockAccess { @@ -813,7 +813,7 @@ public abstract class World implements IBlockAccess {
blockposition = new BlockPosition(blockposition.getX(), 0, blockposition.getZ()); blockposition = new BlockPosition(blockposition.getX(), 0, blockposition.getZ());
} }
@ -146,7 +146,7 @@ index 90229072..e19066ae 100644
return enumskyblock.c; return enumskyblock.c;
} else if (!this.isLoaded(blockposition)) { } else if (!this.isLoaded(blockposition)) {
return enumskyblock.c; return enumskyblock.c;
@@ -824,7 +824,7 @@ public abstract class World implements IBlockAccess { @@ -825,7 +825,7 @@ public abstract class World implements IBlockAccess {
} }
public void a(EnumSkyBlock enumskyblock, BlockPosition blockposition, int i) { public void a(EnumSkyBlock enumskyblock, BlockPosition blockposition, int i) {
@ -155,7 +155,7 @@ index 90229072..e19066ae 100644
if (this.isLoaded(blockposition)) { if (this.isLoaded(blockposition)) {
Chunk chunk = this.getChunkAtWorldCoords(blockposition); Chunk chunk = this.getChunkAtWorldCoords(blockposition);
@@ -848,19 +848,19 @@ public abstract class World implements IBlockAccess { @@ -849,19 +849,19 @@ public abstract class World implements IBlockAccess {
// Paper start - reduces need to do isLoaded before getType // Paper start - reduces need to do isLoaded before getType
public IBlockData getTypeIfLoaded(BlockPosition blockposition) { public IBlockData getTypeIfLoaded(BlockPosition blockposition) {
// CraftBukkit start - tree generation // CraftBukkit start - tree generation
@ -183,7 +183,7 @@ index 90229072..e19066ae 100644
} }
return null; return null;
} }
@@ -868,24 +868,33 @@ public abstract class World implements IBlockAccess { @@ -869,24 +869,33 @@ public abstract class World implements IBlockAccess {
public IBlockData getType(BlockPosition blockposition) { public IBlockData getType(BlockPosition blockposition) {
// CraftBukkit start - tree generation // CraftBukkit start - tree generation
@ -228,7 +228,7 @@ index 90229072..e19066ae 100644
public boolean D() { public boolean D() {
return this.L < 4; return this.L < 4;
@@ -2025,7 +2034,7 @@ public abstract class World implements IBlockAccess { @@ -2026,7 +2035,7 @@ public abstract class World implements IBlockAccess {
public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap(); public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
@Nullable @Nullable
public TileEntity getTileEntity(BlockPosition blockposition) { public TileEntity getTileEntity(BlockPosition blockposition) {
@ -237,7 +237,7 @@ index 90229072..e19066ae 100644
return null; return null;
} else { } else {
// CraftBukkit start // CraftBukkit start
@@ -2066,7 +2075,7 @@ public abstract class World implements IBlockAccess { @@ -2067,7 +2076,7 @@ public abstract class World implements IBlockAccess {
} }
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) { public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@ -246,7 +246,7 @@ index 90229072..e19066ae 100644
if (tileentity != null && !tileentity.y()) { if (tileentity != null && !tileentity.y()) {
// CraftBukkit start // CraftBukkit start
if (captureBlockStates) { if (captureBlockStates) {
@@ -2129,7 +2138,7 @@ public abstract class World implements IBlockAccess { @@ -2130,7 +2139,7 @@ public abstract class World implements IBlockAccess {
} }
public boolean d(BlockPosition blockposition, boolean flag) { public boolean d(BlockPosition blockposition, boolean flag) {
@ -256,5 +256,5 @@ index 90229072..e19066ae 100644
} else { } else {
Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4); Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
-- --
2.13.1.windows.2 2.13.3

12
Spigot-Server-Patches/0091-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch
View File

@ -1,4 +1,4 @@
From 262a1d182955a140f994362012b6901334abab19 Mon Sep 17 00:00:00 2001 From 7b1457ca1476ddf68791945a763403654220e4a3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 19:55:45 -0400 Date: Mon, 28 Mar 2016 19:55:45 -0400
Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@ -11,7 +11,7 @@ Defaulting this to false will provide substantial performance improvement
by saving millions of event calls on redstone heavy servers. by saving millions of event calls on redstone heavy servers.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index adc81072..e706efff 100644 index adc810720..e706efff5 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -268,4 +268,9 @@ public class PaperWorldConfig { @@ -268,4 +268,9 @@ public class PaperWorldConfig {
@ -25,10 +25,10 @@ index adc81072..e706efff 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e19066ae..aeaf7495 100644 index 68845fc64..6953415b2 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -580,7 +580,7 @@ public abstract class World implements IBlockAccess { @@ -581,7 +581,7 @@ public abstract class World implements IBlockAccess {
try { try {
// CraftBukkit start // CraftBukkit start
CraftWorld world = ((WorldServer) this).getWorld(); CraftWorld world = ((WorldServer) this).getWorld();
@ -38,7 +38,7 @@ index e19066ae..aeaf7495 100644
this.getServer().getPluginManager().callEvent(event); this.getServer().getPluginManager().callEvent(event);
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 8e4697a0..3865b31c 100644 index 8e4697a00..3865b31cb 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
@@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; @@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@ -67,5 +67,5 @@ index 8e4697a0..3865b31c 100644
timing.stopTiming(); // Paper timing.stopTiming(); // Paper
} else { } else {
-- --
2.13.1.windows.2 2.13.3

10
Spigot-Server-Patches/0092-Entity-AddTo-RemoveFrom-World-Events.patch
View File

@ -1,14 +1,14 @@
From 19eb951f6074ee625dd7df5ffee8e39afdc8f3e6 Mon Sep 17 00:00:00 2001 From fb2d9badf4002a2c21565ae95d7c9e1fc541db39 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:32:58 -0400 Date: Mon, 28 Mar 2016 20:32:58 -0400
Subject: [PATCH] Entity AddTo/RemoveFrom World Events Subject: [PATCH] Entity AddTo/RemoveFrom World Events
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index aeaf7495..815ca3b5 100644 index 6953415b2..35cc0f6dd 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1185,6 +1185,7 @@ public abstract class World implements IBlockAccess { @@ -1186,6 +1186,7 @@ public abstract class World implements IBlockAccess {
} }
entity.valid = true; // CraftBukkit entity.valid = true; // CraftBukkit
@ -16,7 +16,7 @@ index aeaf7495..815ca3b5 100644
} }
protected void c(Entity entity) { protected void c(Entity entity) {
@@ -1192,6 +1193,7 @@ public abstract class World implements IBlockAccess { @@ -1193,6 +1194,7 @@ public abstract class World implements IBlockAccess {
((IWorldAccess) this.u.get(i)).b(entity); ((IWorldAccess) this.u.get(i)).b(entity);
} }
@ -25,5 +25,5 @@ index aeaf7495..815ca3b5 100644
} }
-- --
2.13.1.windows.2 2.13.3

8
Spigot-Server-Patches/0099-Do-not-load-chunks-for-light-checks.patch
View File

@ -1,4 +1,4 @@
From 6d3f482a0e531d256ae01e19f155152fcf559782 Mon Sep 17 00:00:00 2001 From 57b5f69c07d281e2d1ef1830898882f47a56b79d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 31 Mar 2016 19:17:58 -0400 Date: Thu, 31 Mar 2016 19:17:58 -0400
Subject: [PATCH] Do not load chunks for light checks Subject: [PATCH] Do not load chunks for light checks
@ -7,10 +7,10 @@ Should only happen for blocks on the edge that uses neighbors light level
(certain blocks). In that case, there will be 3-4 other neighbors to get a light level from. (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 815ca3b5..553d9724 100644 index 35cc0f6dd..44bf2a1c2 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -762,6 +762,7 @@ public abstract class World implements IBlockAccess { @@ -763,6 +763,7 @@ public abstract class World implements IBlockAccess {
if (blockposition.getY() >= 256) { if (blockposition.getY() >= 256) {
blockposition = new BlockPosition(blockposition.getX(), 255, blockposition.getZ()); blockposition = new BlockPosition(blockposition.getX(), 255, blockposition.getZ());
} }
@ -19,5 +19,5 @@ index 815ca3b5..553d9724 100644
Chunk chunk = this.getChunkAtWorldCoords(blockposition); Chunk chunk = this.getChunkAtWorldCoords(blockposition);
-- --
2.13.1.windows.2 2.13.3

12
Spigot-Server-Patches/0103-Configurable-Keep-Spawn-Loaded-range-per-world.patch
View File

@ -1,4 +1,4 @@
From 19b25abf11a53f5f7cf115cfdc267a7132fde3fd Mon Sep 17 00:00:00 2001 From d058e49ce71755c48c90aa025f8029d87a402109 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 13 Sep 2014 23:14:43 -0400 Date: Sat, 13 Sep 2014 23:14:43 -0400
Subject: [PATCH] Configurable Keep Spawn Loaded range per world Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -39,10 +39,10 @@ index 6e11ba5b6..71b66bbdf 100644
if (i1 - j > 1000L) { if (i1 - j > 1000L) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 553d9724b..e9446b9ce 100644 index 44bf2a1c2..95b3deae7 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -3208,8 +3208,9 @@ public abstract class World implements IBlockAccess { @@ -3209,8 +3209,9 @@ public abstract class World implements IBlockAccess {
int k = i * 16 + 8 - blockposition.getX(); int k = i * 16 + 8 - blockposition.getX();
int l = j * 16 + 8 - blockposition.getZ(); int l = j * 16 + 8 - blockposition.getZ();
boolean flag = true; boolean flag = true;
@ -54,10 +54,10 @@ index 553d9724b..e9446b9ce 100644
public void a(Packet<?> packet) { public void a(Packet<?> packet) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0f7c67256..c2a29cde5 100644 index c48e5f12c..04b4f7251 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -953,7 +953,7 @@ public final class CraftServer implements Server { @@ -954,7 +954,7 @@ public final class CraftServer implements Server {
System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")"); System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")");
if (internal.getWorld().getKeepSpawnInMemory()) { if (internal.getWorld().getKeepSpawnInMemory()) {
@ -83,5 +83,5 @@ index 843a3415f..24b4a7ea7 100644
loadChunk(chunkCoordX + x, chunkCoordZ + z); loadChunk(chunkCoordX + x, chunkCoordZ + z);
} else { } else {
-- --
2.13.0 2.13.3

8
Spigot-Server-Patches/0104-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
View File

@ -1,14 +1,14 @@
From 7581275bb1126e27d8fef11e75bae21ee10f42d6 Mon Sep 17 00:00:00 2001 From bdb137383d0d801d190e02edd321194dc2e2f1b3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 3 Apr 2016 17:48:50 -0400 Date: Sun, 3 Apr 2016 17:48:50 -0400
Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e9446b9c..777419d8 100644 index 95b3deae7..e1c4a37c1 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -534,6 +534,7 @@ public abstract class World implements IBlockAccess { @@ -535,6 +535,7 @@ public abstract class World implements IBlockAccess {
} }
public void applyPhysics(BlockPosition blockposition, Block block, boolean flag) { public void applyPhysics(BlockPosition blockposition, Block block, boolean flag) {
@ -17,5 +17,5 @@ index e9446b9c..777419d8 100644
this.a(blockposition.east(), block, blockposition); this.a(blockposition.east(), block, blockposition);
this.a(blockposition.down(), block, blockposition); this.a(blockposition.down(), block, blockposition);
-- --
2.13.1.windows.2 2.13.3

10
Spigot-Server-Patches/0105-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
View File

@ -1,14 +1,14 @@
From 6e04dc8bb1d269539abead607ba0030bcc6a3ee2 Mon Sep 17 00:00:00 2001 From 4e33772166c6cbb7f87f5acfe4e0f3efd796f32d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 5 Apr 2016 19:42:22 -0400 Date: Tue, 5 Apr 2016 19:42:22 -0400
Subject: [PATCH] Don't spam reload spawn chunks in nether/end Subject: [PATCH] Don't spam reload spawn chunks in nether/end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 777419d8..5d84c11c 100644 index e1c4a37c1..f0825538c 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -3204,6 +3204,7 @@ public abstract class World implements IBlockAccess { @@ -3205,6 +3205,7 @@ public abstract class World implements IBlockAccess {
return this.P; return this.P;
} }
@ -17,7 +17,7 @@ index 777419d8..5d84c11c 100644
BlockPosition blockposition = this.getSpawn(); BlockPosition blockposition = this.getSpawn();
int k = i * 16 + 8 - blockposition.getX(); int k = i * 16 + 8 - blockposition.getX();
diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
index d0265f96..35d8d1a6 100644 index d0265f960..35d8d1a6e 100644
--- a/src/main/java/net/minecraft/server/WorldProvider.java --- a/src/main/java/net/minecraft/server/WorldProvider.java
+++ b/src/main/java/net/minecraft/server/WorldProvider.java +++ b/src/main/java/net/minecraft/server/WorldProvider.java
@@ -138,6 +138,6 @@ public abstract class WorldProvider { @@ -138,6 +138,6 @@ public abstract class WorldProvider {
@ -29,5 +29,5 @@ index d0265f96..35d8d1a6 100644
} }
} }
-- --
2.13.1.windows.2 2.13.3

16
Spigot-Server-Patches/0109-Remove-unused-World-Tile-Entity-List.patch
View File

@ -1,4 +1,4 @@
From 8f6f830dfa1cca909838bb66f3a13f41bb85881d Mon Sep 17 00:00:00 2001 From 996fd09ea891e189069e2f93750015e43a320558 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 00:25:28 -0400 Date: Wed, 13 Apr 2016 00:25:28 -0400
Subject: [PATCH] Remove unused World Tile Entity List Subject: [PATCH] Remove unused World Tile Entity List
@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
Massive hit to performance and it is completely unnecessary. Massive hit to performance and it is completely unnecessary.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5d84c11c..5e0eb668 100644 index f0825538c..7f3c2c8a7 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess { @@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
@ -18,7 +18,7 @@ index 5d84c11c..5e0eb668 100644
public final List<TileEntity> tileEntityListTick = Lists.newArrayList(); public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
private final List<TileEntity> b = Lists.newArrayList(); private final List<TileEntity> b = Lists.newArrayList();
private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
@@ -1572,7 +1572,7 @@ public abstract class World implements IBlockAccess { @@ -1573,7 +1573,7 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - From below, clean up tile entities before ticking them // CraftBukkit start - From below, clean up tile entities before ticking them
if (!this.tileEntityListUnload.isEmpty()) { if (!this.tileEntityListUnload.isEmpty()) {
this.tileEntityListTick.removeAll(this.tileEntityListUnload); this.tileEntityListTick.removeAll(this.tileEntityListUnload);
@ -27,7 +27,7 @@ index 5d84c11c..5e0eb668 100644
this.tileEntityListUnload.clear(); this.tileEntityListUnload.clear();
} }
// CraftBukkit end // CraftBukkit end
@@ -1623,7 +1623,7 @@ public abstract class World implements IBlockAccess { @@ -1624,7 +1624,7 @@ public abstract class World implements IBlockAccess {
if (tileentity.y()) { if (tileentity.y()) {
tilesThisCycle--; tilesThisCycle--;
this.tileEntityListTick.remove(tileTickPosition--); this.tileEntityListTick.remove(tileTickPosition--);
@ -36,7 +36,7 @@ index 5d84c11c..5e0eb668 100644
if (this.isLoaded(tileentity.getPosition())) { if (this.isLoaded(tileentity.getPosition())) {
this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition()); this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
} }
@@ -1661,7 +1661,7 @@ public abstract class World implements IBlockAccess { @@ -1662,7 +1662,7 @@ public abstract class World implements IBlockAccess {
this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3); this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
// CraftBukkit start // CraftBukkit start
// From above, don't screw this up - SPIGOT-1746 // From above, don't screw this up - SPIGOT-1746
@ -45,7 +45,7 @@ index 5d84c11c..5e0eb668 100644
this.a(tileentity1); this.a(tileentity1);
} }
// CraftBukkit end // CraftBukkit end
@@ -1681,9 +1681,9 @@ public abstract class World implements IBlockAccess { @@ -1682,9 +1682,9 @@ public abstract class World implements IBlockAccess {
protected void l() {} protected void l() {}
public boolean a(TileEntity tileentity) { public boolean a(TileEntity tileentity) {
@ -57,7 +57,7 @@ index 5d84c11c..5e0eb668 100644
this.tileEntityListTick.add(tileentity); this.tileEntityListTick.add(tileentity);
} }
@@ -2122,7 +2122,7 @@ public abstract class World implements IBlockAccess { @@ -2123,7 +2123,7 @@ public abstract class World implements IBlockAccess {
} else { } else {
if (tileentity != null) { if (tileentity != null) {
this.b.remove(tileentity); this.b.remove(tileentity);
@ -67,5 +67,5 @@ index 5d84c11c..5e0eb668 100644
} }
-- --
2.13.1.windows.2 2.13.3

16
Spigot-Server-Patches/0124-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
View File

@ -1,4 +1,4 @@
From 1fd06b2b51cf462fa46c6182d855cb45f213d493 Mon Sep 17 00:00:00 2001 From 5a2d19c17acaf81b1c6f72d8d63fd44af32513dc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 29 Apr 2016 20:02:00 -0400 Date: Fri, 29 Apr 2016 20:02:00 -0400
Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
Additionally, numerous issues to player position tracking on maps has been fixed. Additionally, numerous issues to player position tracking on maps has been fixed.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index e9509e61..1673d028 100644 index e9509e618..1673d0281 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -548,6 +548,12 @@ public abstract class EntityHuman extends EntityLiving { @@ -548,6 +548,12 @@ public abstract class EntityHuman extends EntityLiving {
@ -30,7 +30,7 @@ index e9509e61..1673d028 100644
ItemStack itemstack1 = this.a(entityitem); ItemStack itemstack1 = this.a(entityitem);
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 4c6eb6ed..759dacba 100644 index 4c6eb6ed1..759dacba7 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -90,11 +90,11 @@ public class EntityTrackerEntry { @@ -90,11 +90,11 @@ public class EntityTrackerEntry {
@ -48,10 +48,10 @@ index 4c6eb6ed..759dacba 100644
Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5e0eb668..c74fdae4 100644 index 7f3c2c8a7..6ea36a120 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1223,6 +1223,7 @@ public abstract class World implements IBlockAccess { @@ -1224,6 +1224,7 @@ public abstract class World implements IBlockAccess {
{ {
if ( iter.next().trackee == entity ) if ( iter.next().trackee == entity )
{ {
@ -60,7 +60,7 @@ index 5e0eb668..c74fdae4 100644
} }
} }
diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
index 1096b5c1..59173605 100644 index 1096b5c1f..59173605e 100644
--- a/src/main/java/net/minecraft/server/WorldMap.java --- a/src/main/java/net/minecraft/server/WorldMap.java
+++ b/src/main/java/net/minecraft/server/WorldMap.java +++ b/src/main/java/net/minecraft/server/WorldMap.java
@@ -28,6 +28,7 @@ public class WorldMap extends PersistentBase { @@ -28,6 +28,7 @@ public class WorldMap extends PersistentBase {
@ -132,7 +132,7 @@ index 1096b5c1..59173605 100644
for ( org.bukkit.map.MapCursor cursor : render.cursors) { for ( org.bukkit.map.MapCursor cursor : render.cursors) {
diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
index 256a1317..5768cd51 100644 index 256a13178..5768cd512 100644
--- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
+++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
@@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor; @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor;
@ -145,5 +145,5 @@ index 256a1317..5768cd51 100644
public RenderData() { public RenderData() {
-- --
2.13.1.windows.2 2.13.3

34
Spigot-Server-Patches/0141-Make-entities-look-for-hoppers.patch
View File

@ -1,4 +1,4 @@
From 8ce24b8a5642a47a532941057e9c1b46a7083443 Mon Sep 17 00:00:00 2001 From 3d2fbd9d26c5403f5749630576610bd23219168b Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Sat, 18 Jun 2016 01:01:37 -0500 Date: Sat, 18 Jun 2016 01:01:37 -0500
Subject: [PATCH] Make entities look for hoppers Subject: [PATCH] Make entities look for hoppers
@ -14,7 +14,7 @@ This patch may causes a decrease in the performance of dropped items, which is w
diff --git a/src/main/java/com/destroystokyo/paper/HopperPusher.java b/src/main/java/com/destroystokyo/paper/HopperPusher.java diff --git a/src/main/java/com/destroystokyo/paper/HopperPusher.java b/src/main/java/com/destroystokyo/paper/HopperPusher.java
new file mode 100644 new file mode 100644
index 00000000..aef7c2be index 000000000..aef7c2be9
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/HopperPusher.java +++ b/src/main/java/com/destroystokyo/paper/HopperPusher.java
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
@ -78,7 +78,7 @@ index 00000000..aef7c2be
+ double getZ(); + double getZ();
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index c74071eb..d5d6e7fc 100644 index c74071eb1..d5d6e7fcd 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -341,4 +341,9 @@ public class PaperWorldConfig { @@ -341,4 +341,9 @@ public class PaperWorldConfig {
@ -92,7 +92,7 @@ index c74071eb..d5d6e7fc 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
index 1eb9c2da..c88b76a7 100644 index 1eb9c2da8..c88b76a79 100644
--- a/src/main/java/net/minecraft/server/AxisAlignedBB.java --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
+++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
@@ -235,6 +235,7 @@ public class AxisAlignedBB { @@ -235,6 +235,7 @@ public class AxisAlignedBB {
@ -104,7 +104,7 @@ index 1eb9c2da..c88b76a7 100644
return this.a(axisalignedbb.a, axisalignedbb.b, axisalignedbb.c, axisalignedbb.d, axisalignedbb.e, axisalignedbb.f); return this.a(axisalignedbb.a, axisalignedbb.b, axisalignedbb.c, axisalignedbb.d, axisalignedbb.e, axisalignedbb.f);
} }
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index 008ed206..b3c1f550 100644 index 008ed206d..b3c1f550c 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java --- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -250,6 +250,7 @@ public class BlockPosition extends BaseBlockPosition { @@ -250,6 +250,7 @@ public class BlockPosition extends BaseBlockPosition {
@ -132,7 +132,7 @@ index 008ed206..b3c1f550 100644
this.b = i; this.b = i;
this.c = j; this.c = j;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e78b1c26..0a8d8a1a 100644 index 73507cda8..a55bc1610 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -80,6 +80,19 @@ public abstract class Entity implements ICommandListener { @@ -80,6 +80,19 @@ public abstract class Entity implements ICommandListener {
@ -156,13 +156,13 @@ index e78b1c26..0a8d8a1a 100644
public double motY; public double motY;
public double motZ; public double motZ;
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 14caa86a..1927e8e2 100644 index 4d3aef96b..6593fc633 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java --- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -5,8 +5,15 @@ import javax.annotation.Nullable; @@ -8,8 +8,15 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager; import org.bukkit.event.entity.EntityPickupItemEvent;
import org.apache.logging.log4j.Logger; import org.bukkit.event.player.PlayerPickupItemEvent;
import org.bukkit.event.player.PlayerPickupItemEvent; // CraftBukkit // CraftBukkit end
+import com.destroystokyo.paper.HopperPusher; // Paper +import com.destroystokyo.paper.HopperPusher; // Paper
-public class EntityItem extends Entity { -public class EntityItem extends Entity {
@ -176,7 +176,7 @@ index 14caa86a..1927e8e2 100644
private static final Logger b = LogManager.getLogger(); private static final Logger b = LogManager.getLogger();
private static final DataWatcherObject<ItemStack> c = DataWatcher.a(EntityItem.class, DataWatcherRegistry.f); private static final DataWatcherObject<ItemStack> c = DataWatcher.a(EntityItem.class, DataWatcherRegistry.f);
@@ -56,6 +63,7 @@ public class EntityItem extends Entity { @@ -59,6 +66,7 @@ public class EntityItem extends Entity {
this.die(); this.die();
} else { } else {
super.B_(); super.B_();
@ -184,7 +184,7 @@ index 14caa86a..1927e8e2 100644
// CraftBukkit start - Use wall time for pickup and despawn timers // CraftBukkit start - Use wall time for pickup and despawn timers
int elapsedTicks = MinecraftServer.currentTick - this.lastTick; int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks; if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
@@ -143,6 +151,7 @@ public class EntityItem extends Entity { @@ -146,6 +154,7 @@ public class EntityItem extends Entity {
// Spigot start - copied from above // Spigot start - copied from above
@Override @Override
public void inactiveTick() { public void inactiveTick() {
@ -193,7 +193,7 @@ index 14caa86a..1927e8e2 100644
int elapsedTicks = MinecraftServer.currentTick - this.lastTick; int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks; if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
index b382f818..721c26f3 100644 index 1a2de4b77..41863b08d 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable; @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@ -232,7 +232,7 @@ index b382f818..721c26f3 100644
private NonNullList<ItemStack> items; private NonNullList<ItemStack> items;
private boolean b; private boolean b;
diff --git a/src/main/java/net/minecraft/server/IHopper.java b/src/main/java/net/minecraft/server/IHopper.java diff --git a/src/main/java/net/minecraft/server/IHopper.java b/src/main/java/net/minecraft/server/IHopper.java
index 804215a1..e830d839 100644 index 804215a1c..e830d8390 100644
--- a/src/main/java/net/minecraft/server/IHopper.java --- a/src/main/java/net/minecraft/server/IHopper.java
+++ b/src/main/java/net/minecraft/server/IHopper.java +++ b/src/main/java/net/minecraft/server/IHopper.java
@@ -4,9 +4,9 @@ public interface IHopper extends IInventory { @@ -4,9 +4,9 @@ public interface IHopper extends IInventory {
@ -249,7 +249,7 @@ index 804215a1..e830d839 100644
+ double G(); default double getZ() { return G(); } // Paper - OBFHELPER + double G(); default double getZ() { return G(); } // Paper - OBFHELPER
} }
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index f9981298..d2226164 100644 index f99812989..d22261646 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -126,6 +126,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -126,6 +126,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@ -378,5 +378,5 @@ index f9981298..d2226164 100644
if (!list.isEmpty()) { if (!list.isEmpty()) {
-- --
2.13.1.windows.2 2.13.3

10
Spigot-Server-Patches/0144-Fix-Double-World-Add-issues.patch
View File

@ -1,4 +1,4 @@
From e7eee06f9815db346b424a414627674d4750f037 Mon Sep 17 00:00:00 2001 From 9881feba202a4bcc2566a3c36a6fc038f862b1b7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 21 Jun 2016 22:54:34 -0400 Date: Tue, 21 Jun 2016 22:54:34 -0400
Subject: [PATCH] Fix Double World Add issues Subject: [PATCH] Fix Double World Add issues
@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
Also add debug if something else tries to, and abort before world gets bad state Also add debug if something else tries to, and abort before world gets bad state
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 44f0d883..6b5b5e91 100644 index 44f0d8831..6b5b5e912 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -508,7 +508,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -508,7 +508,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -21,10 +21,10 @@ index 44f0d883..6b5b5e91 100644
Iterator iterator = entity.bF().iterator(); Iterator iterator = entity.bF().iterator();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c74fdae4..2b613d5a 100644 index 6ea36a120..192e4b284 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1101,6 +1101,7 @@ public abstract class World implements IBlockAccess { @@ -1102,6 +1102,7 @@ public abstract class World implements IBlockAccess {
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot
if (entity == null) return false; if (entity == null) return false;
@ -33,5 +33,5 @@ index c74fdae4..2b613d5a 100644
int i = MathHelper.floor(entity.locX / 16.0D); int i = MathHelper.floor(entity.locX / 16.0D);
int j = MathHelper.floor(entity.locZ / 16.0D); int j = MathHelper.floor(entity.locZ / 16.0D);
-- --
2.13.1.windows.2 2.13.3

8
Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
View File

@ -1,4 +1,4 @@
From 9b3e6d2518091c83e149e59e0c32243aa820e6cd Mon Sep 17 00:00:00 2001 From e44db9a616ae69b6329413692978638b5bcf4ea1 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com> From: Gabriele C <sgdc3.mail@gmail.com>
Date: Fri, 5 Aug 2016 01:03:08 +0200 Date: Fri, 5 Aug 2016 01:03:08 +0200
Subject: [PATCH] Add setting for proxy online mode status Subject: [PATCH] Add setting for proxy online mode status
@ -33,10 +33,10 @@ index b943a9b20..8f3b93dc1 100644
} else { } else {
String[] astring1 = astring; String[] astring1 = astring;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c2a29cde5..5a9555135 100644 index 04b4f7251..af3e1a7ac 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1318,7 +1318,8 @@ public final class CraftServer implements Server { @@ -1328,7 +1328,8 @@ public final class CraftServer implements Server {
// Spigot Start // Spigot Start
GameProfile profile = null; GameProfile profile = null;
// Only fetch an online UUID in online mode // Only fetch an online UUID in online mode
@ -47,5 +47,5 @@ index c2a29cde5..5a9555135 100644
profile = console.getUserCache().getProfile( name ); profile = console.getUserCache().getProfile( name );
} }
-- --
2.13.0 2.13.3

8
Spigot-Server-Patches/0156-Chunk-registration-fixes.patch
View File

@ -1,4 +1,4 @@
From a381b7162d665105f52768a2e33871b328e7056d Mon Sep 17 00:00:00 2001 From 20cf38082e3cb4a6d8609320f704905bdac1a62a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 21 Sep 2016 22:54:28 -0400 Date: Wed, 21 Sep 2016 22:54:28 -0400
Subject: [PATCH] Chunk registration fixes Subject: [PATCH] Chunk registration fixes
@ -8,10 +8,10 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
Keep them consistent Keep them consistent
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 2b613d5a..cc3a3618 100644 index 192e4b284..10239a644 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1772,7 +1772,7 @@ public abstract class World implements IBlockAccess { @@ -1773,7 +1773,7 @@ public abstract class World implements IBlockAccess {
} }
i = MathHelper.floor(entity.locX / 16.0D); i = MathHelper.floor(entity.locX / 16.0D);
@ -21,5 +21,5 @@ index 2b613d5a..cc3a3618 100644
if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) { if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) {
-- --
2.13.1.windows.2 2.13.3

8
Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch
View File

@ -1,4 +1,4 @@
From b287a9cb56a72f2ec109954e2b872e4a406f208c Mon Sep 17 00:00:00 2001 From 5e93308e21111deaf7799f42955d37791d72e62f Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com> From: willies952002 <admin@domnian.com>
Date: Mon, 28 Nov 2016 10:21:52 -0500 Date: Mon, 28 Nov 2016 10:21:52 -0500
Subject: [PATCH] Allow Reloading of Command Aliases Subject: [PATCH] Allow Reloading of Command Aliases
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml Reload the aliases stored in commands.yml
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 37dc16186..3d484fbcf 100644 index af3e1a7ac..b76b7c46a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1872,5 +1872,24 @@ public final class CraftServer implements Server { @@ -1882,5 +1882,24 @@ public final class CraftServer implements Server {
}); });
} }
} }
@ -35,5 +35,5 @@ index 37dc16186..3d484fbcf 100644
// Paper end // Paper end
} }
-- --
2.13.3.windows.1 2.13.3

8
Spigot-Server-Patches/0173-Optimize-World.isLoaded-BlockPosition-Z.patch
View File

@ -1,4 +1,4 @@
From 8da283c9a3ba008e2d3f4a0a500e51db495f19a0 Mon Sep 17 00:00:00 2001 From 31e7726cd8505b1c7911976512f0b79f468334ee Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 2 Dec 2016 00:11:43 -0500 Date: Fri, 2 Dec 2016 00:11:43 -0500
Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@ -6,10 +6,10 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
Reduce method invocations for World.isLoaded(BlockPosition)Z Reduce method invocations for World.isLoaded(BlockPosition)Z
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index cc3a3618..58b42882 100644 index 10239a644..f9ee2af80 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -288,7 +288,7 @@ public abstract class World implements IBlockAccess { @@ -289,7 +289,7 @@ public abstract class World implements IBlockAccess {
} }
public boolean isLoaded(BlockPosition blockposition) { public boolean isLoaded(BlockPosition blockposition) {
@ -19,5 +19,5 @@ index cc3a3618..58b42882 100644
public boolean a(BlockPosition blockposition, boolean flag) { public boolean a(BlockPosition blockposition, boolean flag) {
-- --
2.13.1.windows.2 2.13.3

12
Spigot-Server-Patches/0177-Vanished-players-don-t-have-rights.patch
View File

@ -1,11 +1,11 @@
From a0c3fa1f62ecaf3d2855642eb1d209f091fb86b3 Mon Sep 17 00:00:00 2001 From 32ce3dc56283c1575c091375db28077d42450c08 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 16 Dec 2016 22:10:35 -0600 Date: Fri, 16 Dec 2016 22:10:35 -0600
Subject: [PATCH] Vanished players don't have rights Subject: [PATCH] Vanished players don't have rights
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e6b469a00..314d1df4b 100644 index a53c46016..dc0c6d2d8 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener { @@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener {
@ -31,10 +31,10 @@ index c0d97f154..363209170 100644
IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman); IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 58b428827..4e316d286 100644 index f9ee2af80..b60cc0c31 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1807,6 +1807,33 @@ public abstract class World implements IBlockAccess { @@ -1808,6 +1808,33 @@ public abstract class World implements IBlockAccess {
return this.a(axisalignedbb, (Entity) null); return this.a(axisalignedbb, (Entity) null);
} }
@ -68,7 +68,7 @@ index 58b428827..4e316d286 100644
public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) { public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) {
List list = this.getEntities((Entity) null, axisalignedbb); List list = this.getEntities((Entity) null, axisalignedbb);
@@ -2697,7 +2724,7 @@ public abstract class World implements IBlockAccess { @@ -2698,7 +2725,7 @@ public abstract class World implements IBlockAccess {
AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().d(this, blockposition); AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().d(this, blockposition);
// CraftBukkit start - store default return // CraftBukkit start - store default return
@ -96,5 +96,5 @@ index 16f6410b2..883ef489f 100644
return event; return event;
} }
-- --
2.13.2 2.13.3

10
Spigot-Server-Patches/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
View File

@ -1,11 +1,11 @@
From a157c98697f829127ecfd992aeb3a1798e1a2bf4 Mon Sep 17 00:00:00 2001 From 4f3a73aa862aae329def7a7b394634eb0df16ff8 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Wed, 21 Dec 2016 11:52:04 -0600 Date: Wed, 21 Dec 2016 11:52:04 -0600
Subject: [PATCH] Option to prevent armor stands from doing entity lookups Subject: [PATCH] Option to prevent armor stands from doing entity lookups
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 32ca0a40..70af657f 100644 index 32ca0a40e..70af657f5 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -405,4 +405,9 @@ public class PaperWorldConfig { @@ -405,4 +405,9 @@ public class PaperWorldConfig {
@ -19,10 +19,10 @@ index 32ca0a40..70af657f 100644
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4e316d28..29461585 100644 index b60cc0c31..9dfc2b4d9 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1335,6 +1335,7 @@ public abstract class World implements IBlockAccess { @@ -1336,6 +1336,7 @@ public abstract class World implements IBlockAccess {
this.a(entity, axisalignedbb, false, arraylist); this.a(entity, axisalignedbb, false, arraylist);
if (entity != null) { if (entity != null) {
@ -31,5 +31,5 @@ index 4e316d28..29461585 100644
for (int i = 0; i < list.size(); ++i) { for (int i = 0; i < list.size(); ++i) {
-- --
2.13.1.windows.2 2.13.3

8
Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch
View File

@ -1,4 +1,4 @@
From f50ce9dfc0be01c0da8cdfa2c79a72c2aa363b35 Mon Sep 17 00:00:00 2001 From 9e3ed05cadb989ae8e0c9e82f04a3c71bc3af6b5 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Fri, 9 Jun 2017 07:24:34 -0700 Date: Fri, 9 Jun 2017 07:24:34 -0700
Subject: [PATCH] Add configuration option to prevent player names from being Subject: [PATCH] Add configuration option to prevent player names from being
@ -20,10 +20,10 @@ index 28917f63d..f4b237034 100644
+ } + }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3d484fbcf..3c6f46057 100644 index b76b7c46a..c01c43394 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1891,5 +1891,10 @@ public final class CraftServer implements Server { @@ -1901,5 +1901,10 @@ public final class CraftServer implements Server {
commandMap.registerServerAliases(); commandMap.registerServerAliases();
return true; return true;
} }
@ -35,5 +35,5 @@ index 3d484fbcf..3c6f46057 100644
// Paper end // Paper end
} }
-- --
2.13.3.windows.1 2.13.3

10
Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@ -1,4 +1,4 @@
From 3125ca55ee5597dadaf02f5b4e700ececde69805 Mon Sep 17 00:00:00 2001 From 75db35e815b491bb1ea36bb3cca1c0d99e7dfe55 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net> From: Minecrell <dev@minecrell.net>
Date: Fri, 9 Jun 2017 19:03:43 +0200 Date: Fri, 9 Jun 2017 19:03:43 +0200
Subject: [PATCH] Use TerminalConsoleAppender for console improvements Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -310,10 +310,10 @@ index 17c251ba9..c47e05c19 100644
this.k = new GameProfileBanList(PlayerList.a); this.k = new GameProfileBanList(PlayerList.a);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3e5421932..1bc712fa1 100644 index c01c43394..bef164983 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -127,7 +127,6 @@ import io.netty.buffer.ByteBuf; @@ -128,7 +128,6 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufOutputStream; import io.netty.buffer.ByteBufOutputStream;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.handler.codec.base64.Base64; import io.netty.handler.codec.base64.Base64;
@ -321,7 +321,7 @@ index 3e5421932..1bc712fa1 100644
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.craftbukkit.util.CraftNamespacedKey;
@@ -1086,9 +1085,13 @@ public final class CraftServer implements Server { @@ -1087,9 +1086,13 @@ public final class CraftServer implements Server {
return logger; return logger;
} }
@ -639,5 +639,5 @@ index 5cee8f00e..08b6bb7f9 100644
<AppenderRef ref="TerminalConsole" level="info"/> <AppenderRef ref="TerminalConsole" level="info"/>
</Root> </Root>
-- --
2.13.0 2.13.3

14
Spigot-Server-Patches/0213-Item-canEntityPickup.patch
View File

@ -1,14 +1,14 @@
From 2e4a8765544b8d74e9b212bfdf180ef923cf8359 Mon Sep 17 00:00:00 2001 From 5af685a537a19865a59f78d62ce01c506f806ccd Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 May 2017 03:57:17 -0500 Date: Fri, 5 May 2017 03:57:17 -0500
Subject: [PATCH] Item#canEntityPickup Subject: [PATCH] Item#canEntityPickup
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 b594602a..a7bee79b 100644 index 5ea9f3097..89e878365 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
@@ -512,6 +512,12 @@ public abstract class EntityInsentient extends EntityLiving { @@ -514,6 +514,12 @@ public abstract class EntityInsentient extends EntityLiving {
while (iterator.hasNext()) { while (iterator.hasNext()) {
EntityItem entityitem = (EntityItem) iterator.next(); EntityItem entityitem = (EntityItem) iterator.next();
@ -22,10 +22,10 @@ index b594602a..a7bee79b 100644
this.a(entityitem); this.a(entityitem);
} }
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 1927e8e2..08315599 100644 index 6593fc633..99dbb1393 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java --- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -19,6 +19,7 @@ public class EntityItem extends Entity implements HopperPusher { @@ -22,6 +22,7 @@ public class EntityItem extends Entity implements HopperPusher {
private static final DataWatcherObject<ItemStack> c = DataWatcher.a(EntityItem.class, DataWatcherRegistry.f); private static final DataWatcherObject<ItemStack> c = DataWatcher.a(EntityItem.class, DataWatcherRegistry.f);
private int age; private int age;
public int pickupDelay; public int pickupDelay;
@ -34,7 +34,7 @@ index 1927e8e2..08315599 100644
private String g; private String g;
private String h; private String h;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
index a17a537d..1df17f09 100644 index a17a537d6..1df17f09b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -37,6 +37,16 @@ public class CraftItem extends CraftEntity implements Item { @@ -37,6 +37,16 @@ public class CraftItem extends CraftEntity implements Item {
@ -55,5 +55,5 @@ index a17a537d..1df17f09 100644
public String toString() { public String toString() {
return "CraftItem"; return "CraftItem";
-- --
2.13.1.windows.2 2.13.3

23
Spigot-Server-Patches/0214-PlayerPickupItemEvent-setFlyAtPlayer.patch
View File

@ -1,14 +1,14 @@
From 063ea4b06d53bcfedb783b7b937482af565db81d Mon Sep 17 00:00:00 2001 From 2f3f52a7ba8b8783d8d2e034b431cde5c3da87bb Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 May 2017 06:26:09 -0500 Date: Sun, 7 May 2017 06:26:09 -0500
Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index dc52ef45b..fa207c579 100644 index 99dbb1393..ae4910b4b 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java --- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -329,6 +329,7 @@ public class EntityItem extends Entity implements HopperPusher { @@ -332,6 +332,7 @@ public class EntityItem extends Entity implements HopperPusher {
// CraftBukkit start - fire PlayerPickupItemEvent // CraftBukkit start - fire PlayerPickupItemEvent
int canHold = entityhuman.inventory.canHold(itemstack); int canHold = entityhuman.inventory.canHold(itemstack);
int remaining = i - canHold; int remaining = i - canHold;
@ -16,13 +16,12 @@ index dc52ef45b..fa207c579 100644
if (this.pickupDelay <= 0 && canHold > 0) { if (this.pickupDelay <= 0 && canHold > 0) {
itemstack.setCount(canHold); itemstack.setCount(canHold);
@@ -336,8 +337,14 @@ public class EntityItem extends Entity implements HopperPusher { @@ -339,7 +340,13 @@ public class EntityItem extends Entity implements HopperPusher {
event.setCancelled(!entityhuman.canPickUpLoot); PlayerPickupItemEvent playerEvent = new PlayerPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), (org.bukkit.entity.Item) this.getBukkitEntity(), remaining);
this.world.getServer().getPluginManager().callEvent(event); playerEvent.setCancelled(!entityhuman.canPickUpLoot);
itemstack.setCount(canHold + remaining); this.world.getServer().getPluginManager().callEvent(playerEvent);
+ flyAtPlayer = event.getFlyAtPlayer(); // Paper + flyAtPlayer = playerEvent.getFlyAtPlayer(); // Paper
if (playerEvent.isCancelled()) {
if (event.isCancelled()) {
+ // Paper Start + // Paper Start
+ if (flyAtPlayer) { + if (flyAtPlayer) {
+ entityhuman.receive(this, i); + entityhuman.receive(this, i);
@ -31,7 +30,7 @@ index dc52ef45b..fa207c579 100644
return; return;
} }
@@ -347,7 +354,11 @@ public class EntityItem extends Entity implements HopperPusher { @@ -359,7 +366,11 @@ public class EntityItem extends Entity implements HopperPusher {
// CraftBukkit end // CraftBukkit end
if (this.pickupDelay == 0 && (this.h == null || 6000 - this.age <= 200 || this.h.equals(entityhuman.getName())) && entityhuman.inventory.pickup(itemstack)) { if (this.pickupDelay == 0 && (this.h == null || 6000 - this.age <= 200 || this.h.equals(entityhuman.getName())) && entityhuman.inventory.pickup(itemstack)) {
@ -45,5 +44,5 @@ index dc52ef45b..fa207c579 100644
this.die(); this.die();
itemstack.setCount(i); itemstack.setCount(i);
-- --
2.13.0 2.13.3

20
Spigot-Server-Patches/0215-PlayerAttemptPickupItemEvent.patch
View File

@ -1,22 +1,22 @@
From b4910c9b67d00ff02eb6cdd8261ba0c7b804201e Mon Sep 17 00:00:00 2001 From acb8885cb0b64c6a23c1a280e3c3273f59f94410 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 11 Jun 2017 16:30:30 -0500 Date: Sun, 11 Jun 2017 16:30:30 -0500
Subject: [PATCH] PlayerAttemptPickupItemEvent Subject: [PATCH] PlayerAttemptPickupItemEvent
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 6ed3d790..21a7a3a1 100644 index fed1f4ab2..a580a5866 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java --- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -4,6 +4,7 @@ import java.util.Iterator; @@ -8,6 +8,7 @@ import org.apache.logging.log4j.Logger;
import javax.annotation.Nullable; import org.bukkit.event.entity.EntityPickupItemEvent;
import org.apache.logging.log4j.LogManager; import org.bukkit.event.player.PlayerPickupItemEvent;
import org.apache.logging.log4j.Logger; // CraftBukkit end
+import org.bukkit.event.player.PlayerAttemptPickupItemEvent; +import org.bukkit.event.player.PlayerAttemptPickupItemEvent; // Paper
import org.bukkit.event.player.PlayerPickupItemEvent; // CraftBukkit
import com.destroystokyo.paper.HopperPusher; // Paper import com.destroystokyo.paper.HopperPusher; // Paper
@@ -326,6 +327,12 @@ public class EntityItem extends Entity implements HopperPusher { // Paper start - implement HopperPusher
@@ -329,6 +330,12 @@ public class EntityItem extends Entity implements HopperPusher {
Item item = itemstack.getItem(); Item item = itemstack.getItem();
int i = itemstack.getCount(); int i = itemstack.getCount();
@ -30,5 +30,5 @@ index 6ed3d790..21a7a3a1 100644
int canHold = entityhuman.inventory.canHold(itemstack); int canHold = entityhuman.inventory.canHold(itemstack);
int remaining = i - canHold; int remaining = i - canHold;
-- --
2.13.1.windows.2 2.13.3

12
Spigot-Server-Patches/0217-Add-UnknownCommandEvent.patch → Spigot-Server-Patches/0216-Add-UnknownCommandEvent.patch
View File

@ -1,22 +1,22 @@
From 02d530402fe0265e0a21fc07916497ed13beb315 Mon Sep 17 00:00:00 2001 From c5237a813380ef84b3988222166a0bd0682dde11 Mon Sep 17 00:00:00 2001
From: Sweepyoface <github@sweepy.pw> From: Sweepyoface <github@sweepy.pw>
Date: Sat, 17 Jun 2017 18:48:21 -0400 Date: Sat, 17 Jun 2017 18:48:21 -0400
Subject: [PATCH] Add UnknownCommandEvent Subject: [PATCH] Add UnknownCommandEvent
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1bc712fa1..bc741281b 100644 index bef164983..3541ad3ff 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -78,6 +78,7 @@ import org.bukkit.craftbukkit.util.Versioning; @@ -78,6 +78,7 @@ import org.bukkit.craftbukkit.util.Versioning;
import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions; import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
+import org.bukkit.event.command.UnknownCommandEvent; +import org.bukkit.event.command.UnknownCommandEvent; // Paper
import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerChatTabCompleteEvent; import org.bukkit.event.player.PlayerChatTabCompleteEvent;
import org.bukkit.event.world.WorldInitEvent; import org.bukkit.event.server.BroadcastMessageEvent;
@@ -667,7 +668,13 @@ public final class CraftServer implements Server { @@ -668,7 +669,13 @@ public final class CraftServer implements Server {
// Spigot start // Spigot start
if (StringUtils.isNotEmpty(org.spigotmc.SpigotConfig.unknownCommandMessage)) { if (StringUtils.isNotEmpty(org.spigotmc.SpigotConfig.unknownCommandMessage)) {
@ -32,5 +32,5 @@ index 1bc712fa1..bc741281b 100644
// Spigot end // Spigot end
-- --
2.13.0 2.13.3

42
Spigot-Server-Patches/0216-EntityPickupItemEvent.patch
View File

@ -1,42 +0,0 @@
From 2bd8b2b7e764e6e93fe7ac9d037d65f240bf915a Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 May 2017 01:16:22 -0500
Subject: [PATCH] EntityPickupItemEvent
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index a7bee79b..a93c0001 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -10,8 +10,11 @@ import java.util.UUID;
import javax.annotation.Nullable;
// CraftBukkit start
+import org.bukkit.craftbukkit.entity.CraftItem;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.event.entity.EntityPickupItemEvent;
import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
import org.bukkit.event.entity.EntityTargetEvent;
import org.bukkit.event.entity.EntityUnleashEvent;
@@ -568,6 +571,16 @@ public abstract class EntityInsentient extends EntityLiving {
}
if (flag && this.c(itemstack)) {
+
+ // Paper Start
+ EntityPickupItemEvent event = new EntityPickupItemEvent((LivingEntity) this.getBukkitEntity(), new CraftItem(this.world.getServer(), entityitem));
+ this.world.getServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ return;
+ }
+ // Paper end
+
double d0;
switch (enumitemslot.a()) {
--
2.13.1.windows.2

8
Spigot-Server-Patches/0218-Shoulder-Entities-Release-API.patch → Spigot-Server-Patches/0217-Shoulder-Entities-Release-API.patch
View File

@ -1,11 +1,11 @@
From 413ee80e6b51a9c2966837ee1bc7a6b034f4704b Mon Sep 17 00:00:00 2001 From d233de90c6ccc3eefdc19e94caf44cffd8abd3a9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 15:18:30 -0400 Date: Sat, 17 Jun 2017 15:18:30 -0400
Subject: [PATCH] Shoulder Entities Release API Subject: [PATCH] Shoulder Entities Release API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index f5e25e63..c7409555 100644 index f5e25e63d..c74095554 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1717,21 +1717,48 @@ public abstract class EntityHuman extends EntityLiving { @@ -1717,21 +1717,48 @@ public abstract class EntityHuman extends EntityLiving {
@ -62,7 +62,7 @@ index f5e25e63..c7409555 100644
public abstract boolean isSpectator(); public abstract boolean isSpectator();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 25e1e5a3..463dddc9 100644 index 25e1e5a3f..463dddc98 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -441,6 +441,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -441,6 +441,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@ -99,5 +99,5 @@ index 25e1e5a3..463dddc9 100644
public org.bukkit.entity.Entity getShoulderEntityLeft() { public org.bukkit.entity.Entity getShoulderEntityLeft() {
if (!getHandle().getShoulderEntityLeft().isEmpty()) { if (!getHandle().getShoulderEntityLeft().isEmpty()) {
-- --
2.13.1.windows.2 2.13.3

6
Spigot-Server-Patches/0219-Profile-Lookup-Events.patch → Spigot-Server-Patches/0218-Profile-Lookup-Events.patch
View File

@ -1,4 +1,4 @@
From 0ef4633089e4d58beedfef2f7f141b6115288788 Mon Sep 17 00:00:00 2001 From c5ae72ae942f1d3ce21c4aaa34849842598d2f03 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 17 Jun 2017 17:00:32 -0400 Date: Sat, 17 Jun 2017 17:00:32 -0400
Subject: [PATCH] Profile Lookup Events Subject: [PATCH] Profile Lookup Events
@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
profiles that had to be looked up. profiles that had to be looked up.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8ca8fdce..ab870310 100644 index 8ca8fdceb..ab8703106 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1018,6 +1018,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -1018,6 +1018,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -19,5 +19,5 @@ index 8ca8fdce..ab870310 100644
final DedicatedServer dedicatedserver = new DedicatedServer(options, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache); final DedicatedServer dedicatedserver = new DedicatedServer(options, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache);
-- --
2.13.1.windows.2 2.13.3

4
Spigot-Server-Patches/0220-Block-player-logins-during-server-shutdown.patch → Spigot-Server-Patches/0219-Block-player-logins-during-server-shutdown.patch
View File

@ -1,4 +1,4 @@
From 0b3e79d1a621e3ffb9785ab06e7e0192d11d13d9 Mon Sep 17 00:00:00 2001 From 22113031e03ae1a537f3b925401468157bde485c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 2 Jul 2017 21:35:56 -0500 Date: Sun, 2 Jul 2017 21:35:56 -0500
Subject: [PATCH] Block player logins during server shutdown Subject: [PATCH] Block player logins during server shutdown
@ -22,5 +22,5 @@ index 2158fcd32..c5434e6ba 100644
this.b(); this.b();
} else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) { } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
-- --
2.13.3.windows.1 2.13.3

10
Spigot-Server-Patches/0221-Entity-fromMobSpawner.patch → Spigot-Server-Patches/0220-Entity-fromMobSpawner.patch
View File

@ -1,11 +1,11 @@
From 1b9e03fd489394f2f426ae65854e6c4ae2cd1932 Mon Sep 17 00:00:00 2001 From 24d3562e9c9d1ef311004213c532d73d08e6b175 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500 Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner() Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d34ec4ff..65d7e1a1 100644 index ae3e38102..27c28cfb1 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -169,6 +169,7 @@ public abstract class Entity implements ICommandListener { @@ -169,6 +169,7 @@ public abstract class Entity implements ICommandListener {
@ -37,7 +37,7 @@ index d34ec4ff..65d7e1a1 100644
} catch (Throwable throwable) { } catch (Throwable throwable) {
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index dd740276..a5b5ef0f 100644 index dd740276c..a5b5ef0ff 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -106,6 +106,7 @@ public abstract class MobSpawnerAbstract { @@ -106,6 +106,7 @@ public abstract class MobSpawnerAbstract {
@ -49,7 +49,7 @@ index dd740276..a5b5ef0f 100644
if ( entity.world.spigotConfig.nerfSpawnerMobs ) if ( entity.world.spigotConfig.nerfSpawnerMobs )
{ {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 05f3df4e..d23a72d6 100644 index 05f3df4e7..d23a72d66 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -788,5 +788,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -788,5 +788,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -64,5 +64,5 @@ index 05f3df4e..d23a72d6 100644
// Paper end // Paper end
} }
-- --
2.13.2.windows.1 2.13.3

4
Spigot-Server-Patches/0222-Fix-Anvil-Level-sync-to-client.patch → Spigot-Server-Patches/0221-Fix-Anvil-Level-sync-to-client.patch
View File

@ -1,4 +1,4 @@
From 361c8249bde5116c72bc4ddf10d1fba1d9645b1b Mon Sep 17 00:00:00 2001 From 284a9f0f38f2941e51414c9f3cbf537f340f4256 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 11 Jul 2017 23:17:57 -0400 Date: Tue, 11 Jul 2017 23:17:57 -0400
Subject: [PATCH] Fix Anvil Level sync to client Subject: [PATCH] Fix Anvil Level sync to client
@ -42,5 +42,5 @@ index 005c8a00b..c9a707e7e 100644
return true; return true;
} }
-- --
2.13.3.windows.1 2.13.3

2
Spigot-Server-Patches/0223-Add-missing-coverages-for-getTileEntity-in-order-to-.patch → Spigot-Server-Patches/0222-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
View File

@ -1,4 +1,4 @@
From 2b0c67ca443f56e8348ac59c4c17d97904c2529b Mon Sep 17 00:00:00 2001 From e39cd406c65d339f164feb00677c6543f0d6c583 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 22 Jul 2017 15:22:59 +0100 Date: Sat, 22 Jul 2017 15:22:59 +0100
Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt

4
Spigot-Server-Patches/0224-Fix-Recipe-Books.patch → Spigot-Server-Patches/0223-Fix-Recipe-Books.patch
View File

@ -1,4 +1,4 @@
From 3f62fddb4eedc5054286eaa7036099424d66ee03 Mon Sep 17 00:00:00 2001 From 9f86985393516537a52bbe0b3a899df08c65410e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 26 Jul 2017 21:12:15 -0400 Date: Wed, 26 Jul 2017 21:12:15 -0400
Subject: [PATCH] Fix Recipe Books Subject: [PATCH] Fix Recipe Books
@ -80,5 +80,5 @@ index 682211cdd..5b9021939 100644
} }
-- --
2.13.0 2.13.3

4
Spigot-Server-Patches/0225-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch → Spigot-Server-Patches/0224-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
View File

@ -1,4 +1,4 @@
From 56b0088908dcbb7b4d392bfeb57e9d1eb16d1d47 Mon Sep 17 00:00:00 2001 From 0f046d6d6906f3bfc49f815525a329ec91011970 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com> From: willies952002 <admin@domnian.com>
Date: Fri, 5 May 2017 18:59:22 -0400 Date: Fri, 5 May 2017 18:59:22 -0400
Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent
@ -64,5 +64,5 @@ index 313bb0007..45d6984f7 100644
playerSample.a(profiles.toArray(new GameProfile[profiles.size()])); playerSample.a(profiles.toArray(new GameProfile[profiles.size()]));
-- --
2.13.0 2.13.3

4
Spigot-Server-Patches/0226-Improve-the-Saddle-API-for-Horses.patch → Spigot-Server-Patches/0225-Improve-the-Saddle-API-for-Horses.patch
View File

@ -1,4 +1,4 @@
From 4d798b1cc1dabc6c33aba84e558a5fcaa6ba5fa7 Mon Sep 17 00:00:00 2001 From 676feaf53d0fe17a5ad8b25206195309f5ec16d0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 10 Dec 2016 16:24:06 -0500 Date: Sat, 10 Dec 2016 16:24:06 -0500
Subject: [PATCH] Improve the Saddle API for Horses Subject: [PATCH] Improve the Saddle API for Horses
@ -83,5 +83,5 @@ index 000000000..615010c40
+ } + }
+} +}
-- --
2.13.0 2.13.3

4
Spigot-Server-Patches/0227-Implement-ensureServerConversions-API.patch → Spigot-Server-Patches/0226-Implement-ensureServerConversions-API.patch
View File

@ -1,4 +1,4 @@
From ded2461db3d25440ded59255605415af572c88b6 Mon Sep 17 00:00:00 2001 From 6794890ca2d6ab13b1c6af15fac72be26fedeb33 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 22:43:12 -0400 Date: Wed, 4 May 2016 22:43:12 -0400
Subject: [PATCH] Implement ensureServerConversions API Subject: [PATCH] Implement ensureServerConversions API
@ -23,5 +23,5 @@ index 49ebad22e..eb6987338 100644
+ // Paper end + // Paper end
} }
-- --
2.13.0 2.13.3

4
Spigot-Server-Patches/0228-Implement-getI18NDisplayName.patch → Spigot-Server-Patches/0227-Implement-getI18NDisplayName.patch
View File

@ -1,4 +1,4 @@
From e5d40b54815a96cdc0b4a6a6765eb5c7c903128c Mon Sep 17 00:00:00 2001 From ca50945328596a8fd4bcd750ee3e56917822c4fe Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:59:38 -0400 Date: Wed, 4 May 2016 23:59:38 -0400
Subject: [PATCH] Implement getI18NDisplayName Subject: [PATCH] Implement getI18NDisplayName
@ -31,5 +31,5 @@ index eb6987338..c2f26577c 100644
// Paper end // Paper end
} }
-- --
2.13.0 2.13.3

4
Spigot-Server-Patches/0229-GH-806-Respect-saving-disabled-before-unloading-all-.patch → Spigot-Server-Patches/0228-GH-806-Respect-saving-disabled-before-unloading-all-.patch
View File

@ -1,4 +1,4 @@
From c07b65aae6f24e200c0df831408d0857ac373db9 Mon Sep 17 00:00:00 2001 From b895a633d1f33fa6c237ddf6bee17010cd518b94 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 27 Jul 2017 00:06:43 -0400 Date: Thu, 27 Jul 2017 00:06:43 -0400
Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
@ -22,5 +22,5 @@ index 14ea89c91..08e0cdf6d 100644
} }
} // Paper timing } // Paper timing
-- --
2.13.0 2.13.3

4
Spigot-Server-Patches/0230-ProfileWhitelistVerifyEvent.patch → Spigot-Server-Patches/0229-ProfileWhitelistVerifyEvent.patch
View File

@ -1,4 +1,4 @@
From 1f4300aee18c3589dc5031b8f4958672eb951212 Mon Sep 17 00:00:00 2001 From 86a8bd035f0378388b3a1488861e0ca35a696ea2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 3 Jul 2017 18:11:10 -0500 Date: Mon, 3 Jul 2017 18:11:10 -0500
Subject: [PATCH] ProfileWhitelistVerifyEvent Subject: [PATCH] ProfileWhitelistVerifyEvent
@ -48,5 +48,5 @@ index c47e05c19..a038d0987 100644
public boolean isOp(GameProfile gameprofile) { public boolean isOp(GameProfile gameprofile) {
return this.operators.d(gameprofile) || this.server.R() && this.server.worlds.get(0).getWorldData().u() && this.server.Q().equalsIgnoreCase(gameprofile.getName()) || this.u; // CraftBukkit return this.operators.d(gameprofile) || this.server.R() && this.server.worlds.get(0).getWorldData().u() && this.server.Q().equalsIgnoreCase(gameprofile.getName()) || this.u; // CraftBukkit
-- --
2.13.0 2.13.3

2
work/Bukkit

@ -1 +1 @@
Subproject commit 6ed0a976e5e8da5599c95eb7e92976f1c839acf1 Subproject commit a4b56a40cf4830115938b1caf9e33c087edefd2d

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit b1b9ab0df94c3b4b5c2613b7bf6347be10e864fc Subproject commit 2c5c611d0c3c198c1ac904e8d64051a8437a8720