[CI-SKIP] [Auto] Rebuild Patches

A recent commit has been made that caused patches to be out of order, rebuilding
This commit is contained in:
Aikar 2018-09-03 12:31:32 -04:00
parent 28557509c5
commit d37d04a52f
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
25 changed files with 34 additions and 34 deletions

View File

@ -1,4 +1,4 @@
From 00c82216240081350df85a95ed50e9c6368029bc Mon Sep 17 00:00:00 2001 From 2e26c681872c7a75274d912ea43d844faf0c39bc Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc> From: kashike <kashike@vq.lc>
Date: Wed, 15 Aug 2018 01:26:09 -0700 Date: Wed, 15 Aug 2018 01:26:09 -0700
Subject: [PATCH] Allow disabling armour stand ticking Subject: [PATCH] Allow disabling armour stand ticking

View File

@ -1,4 +1,4 @@
From 5d6a52b580d179bcd59043c97967d4e500819a61 Mon Sep 17 00:00:00 2001 From 19265f90b53f78867e779c8cea4b237694e462d3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 16 Aug 2018 17:36:41 -0400 Date: Thu, 16 Aug 2018 17:36:41 -0400
Subject: [PATCH] Ensure chunks are always loaded on hard position sets Subject: [PATCH] Ensure chunks are always loaded on hard position sets
@ -17,7 +17,7 @@ guaranteeing that the entity will be properly registered
into its new home comfortably. into its new home comfortably.
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 7b07fe1990..de34a70e9b 100644 index 2f87439c47..4252e8c02a 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
@@ -1364,6 +1364,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -1364,6 +1364,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

View File

@ -1,4 +1,4 @@
From fa8038c2779fe4080fd5ad15be4128adee1ddcc1 Mon Sep 17 00:00:00 2001 From 3c8e36e09accde296da36b77e7e82967d7dc80f1 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com> From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Wed, 15 Aug 2018 12:05:12 -0700 Date: Wed, 15 Aug 2018 12:05:12 -0700
Subject: [PATCH] Optimize BlockPosition helper methods Subject: [PATCH] Optimize BlockPosition helper methods

View File

@ -1,4 +1,4 @@
From 7832ef53a12cd1129da407349dd935f12f05d1fb Mon Sep 17 00:00:00 2001 From 6b92f447cc46cd7d22d28407b1e0e9e530ddffa5 Mon Sep 17 00:00:00 2001
From: Mystiflow <mystiflow@gmail.com> From: Mystiflow <mystiflow@gmail.com>
Date: Fri, 6 Jul 2018 13:21:30 +0100 Date: Fri, 6 Jul 2018 13:21:30 +0100
Subject: [PATCH] Send nearby packets from world player list not server list Subject: [PATCH] Send nearby packets from world player list not server list

View File

@ -1,4 +1,4 @@
From f5d3a976a51d35831486560b52f70aba7285ba67 Mon Sep 17 00:00:00 2001 From cfe60b56f90e65e48b707b3a0d3d81615f036454 Mon Sep 17 00:00:00 2001
From: Colin Godsey <crgodsey@gmail.com> From: Colin Godsey <crgodsey@gmail.com>
Date: Wed, 8 Aug 2018 10:10:06 -0600 Date: Wed, 8 Aug 2018 10:10:06 -0600
Subject: [PATCH] Cache World Entity Type counts Subject: [PATCH] Cache World Entity Type counts

View File

@ -1,4 +1,4 @@
From e2792cb439fa463c11c4f2419034debd8a9019b5 Mon Sep 17 00:00:00 2001 From c9a8b3125c4f51af38c75e34f3913eab6bcf1e5e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 18 Aug 2018 12:43:16 -0400 Date: Sat, 18 Aug 2018 12:43:16 -0400
Subject: [PATCH] Restore vanlla default mob-spawn-range Subject: [PATCH] Restore vanlla default mob-spawn-range

View File

@ -1,4 +1,4 @@
From 96715633ee7969f4452cfe39f33ab4534a02725b Mon Sep 17 00:00:00 2001 From 7391cd02aec8f6b76a4bf6d64ac5213431bec17c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 27 Apr 2016 22:09:52 -0400 Date: Wed, 27 Apr 2016 22:09:52 -0400
Subject: [PATCH] Optimize Hoppers Subject: [PATCH] Optimize Hoppers

View File

@ -1,4 +1,4 @@
From 328689b5cc58e53615c8fde2642e9f0d096f2a75 Mon Sep 17 00:00:00 2001 From 753b7c381064ecb7032ce34071112dd871ddbc6b Mon Sep 17 00:00:00 2001
From: miclebrick <miclebrick@outlook.com> From: miclebrick <miclebrick@outlook.com>
Date: Thu, 23 Aug 2018 11:45:32 -0400 Date: Thu, 23 Aug 2018 11:45:32 -0400
Subject: [PATCH] Optimize CraftBlockData Creation Subject: [PATCH] Optimize CraftBlockData Creation

View File

@ -1,4 +1,4 @@
From c7d0c523d9cd4e4d524b76b6418b3321524276ef Mon Sep 17 00:00:00 2001 From b8b28dd95e1878ec15ffca803089743c286a8636 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Thu, 23 Aug 2018 09:25:30 -0500 Date: Thu, 23 Aug 2018 09:25:30 -0500
Subject: [PATCH] Fix MC-124320 Subject: [PATCH] Fix MC-124320

View File

@ -1,4 +1,4 @@
From a68f2567d3a973df7563af421acec948f7e19251 Mon Sep 17 00:00:00 2001 From 7c02c49425ecd113d16d1bcb93a0efc80f407877 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 24 Aug 2018 08:18:42 -0500 Date: Fri, 24 Aug 2018 08:18:42 -0500
Subject: [PATCH] Slime Pathfinder Events Subject: [PATCH] Slime Pathfinder Events

View File

@ -1,4 +1,4 @@
From 007fad111fa8eb2e98ae7de91d7e2c2020b883f5 Mon Sep 17 00:00:00 2001 From c1aeede6736d16c3a1b61fee9caaf09e2fca2d5b Mon Sep 17 00:00:00 2001
From: cswhite2000 <18whitechristop@gmail.com> From: cswhite2000 <18whitechristop@gmail.com>
Date: Tue, 21 Aug 2018 19:44:10 -0700 Date: Tue, 21 Aug 2018 19:44:10 -0700
Subject: [PATCH] isChunkGenerated API Subject: [PATCH] isChunkGenerated API
@ -6,7 +6,7 @@ Subject: [PATCH] isChunkGenerated API
Resolves #1329 Resolves #1329
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 5e8a20fdd6..5eaef413a6 100644 index 0ca071b879..96d49b469a 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
@@ -34,6 +34,9 @@ public class ChunkProviderServer implements IChunkProvider { @@ -34,6 +34,9 @@ public class ChunkProviderServer implements IChunkProvider {

View File

@ -1,11 +1,11 @@
From 7b67e82d351a4ed6eae20287a100ce6e76bc3e82 Mon Sep 17 00:00:00 2001 From e951f400f5d3718775c296babb9daa0b8d565e0b Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk> From: Sotr <i@omc.hk>
Date: Thu, 23 Aug 2018 16:14:12 +0800 Date: Thu, 23 Aug 2018 16:14:12 +0800
Subject: [PATCH] Add source block to BlockPhysicsEvent Subject: [PATCH] Add source block to BlockPhysicsEvent
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 abf3796d91..2a7abae942 100644 index c479828d49..20bead54bf 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
@@ -623,7 +623,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -623,7 +623,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

View File

@ -1,4 +1,4 @@
From 3ce5c28b7988c4e38e9ffcfdd295bd4d52fe6289 Mon Sep 17 00:00:00 2001 From 6d63204aaeb5b73f788fbda5473db22b3c576c21 Mon Sep 17 00:00:00 2001
From: stonar96 <minecraft.stonar96@gmail.com> From: stonar96 <minecraft.stonar96@gmail.com>
Date: Mon, 20 Aug 2018 03:03:58 +0200 Date: Mon, 20 Aug 2018 03:03:58 +0200
Subject: [PATCH] Anti-Xray Subject: [PATCH] Anti-Xray

View File

@ -1,4 +1,4 @@
From d95c11e875b62bed044078961d8a8529a2f5e258 Mon Sep 17 00:00:00 2001 From f6bd802467ab06a881f604a02270f992fb5d5bac Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 8 Aug 2018 16:33:21 -0600 Date: Wed, 8 Aug 2018 16:33:21 -0600
Subject: [PATCH] Configurable speed for water flowing over lava Subject: [PATCH] Configurable speed for water flowing over lava

View File

@ -1,4 +1,4 @@
From 825b7b20507d171d3c14a620f650f33ae97d89cc Mon Sep 17 00:00:00 2001 From a7e784f0f94bb0e29e0b4f9bd7d155c866b913c4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 26 Aug 2018 20:49:50 -0400 Date: Sun, 26 Aug 2018 20:49:50 -0400
Subject: [PATCH] Optimize RegistryMaterials Subject: [PATCH] Optimize RegistryMaterials

View File

@ -1,4 +1,4 @@
From d3e097f190c84d5d109bd328c4e32c349ead4a25 Mon Sep 17 00:00:00 2001 From b0103cefc4681ecee343d74439e248db5ed62cbd Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 25 Aug 2018 19:56:51 -0500 Date: Sat, 25 Aug 2018 19:56:51 -0500
Subject: [PATCH] Add PhantomPreSpawnEvent Subject: [PATCH] Add PhantomPreSpawnEvent

View File

@ -1,11 +1,11 @@
From b68ac5de0a95fe88718aaaf7e2c4621543a836da Mon Sep 17 00:00:00 2001 From 981e33a97c8acb8e99d2fbeb790fe432b77ac87a Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 24 Aug 2018 11:50:26 -0500 Date: Fri, 24 Aug 2018 11:50:26 -0500
Subject: [PATCH] Add More Creeper API Subject: [PATCH] Add More Creeper API
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 19022b6e2..321e00cef 100644 index 19022b6e24..e070e7b2d2 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java --- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster { @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster {
@ -91,7 +91,7 @@ index 19022b6e2..321e00cef 100644
public boolean canCauseHeadDrop() { public boolean canCauseHeadDrop() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
index ffebb54ca..ab2b20a0d 100644 index ffebb54caa..ab2b20a0d4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
@@ -76,4 +76,22 @@ public class CraftCreeper extends CraftMonster implements Creeper { @@ -76,4 +76,22 @@ public class CraftCreeper extends CraftMonster implements Creeper {

View File

@ -1,4 +1,4 @@
From bd27b410c06aa3d5b0d4b93db276d478a3f1ff02 Mon Sep 17 00:00:00 2001 From 50e2779593afd189a4d80cf496965d48b0cac746 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 28 Aug 2018 21:35:05 -0400 Date: Tue, 28 Aug 2018 21:35:05 -0400
Subject: [PATCH] Optimize Chunk#getPos Subject: [PATCH] Optimize Chunk#getPos

View File

@ -1,4 +1,4 @@
From a3fb16787b296fde8ee82cb76d3a305233d8e5cf Mon Sep 17 00:00:00 2001 From 98da4abc6afd89a1c6188ba96bb6a61f830b691b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 28 Aug 2018 22:11:13 -0400 Date: Tue, 28 Aug 2018 22:11:13 -0400
Subject: [PATCH] Use an EnumMap for Chunk Height Maps Subject: [PATCH] Use an EnumMap for Chunk Height Maps

View File

@ -1,11 +1,11 @@
From 64a7e90d6fc4c9d64a49ea15cb90268f662086e0 Mon Sep 17 00:00:00 2001 From 9f558a69347dfbaaf71ff2d963e7f27d8b972aae Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com> From: willies952002 <admin@domnian.com>
Date: Wed, 29 Aug 2018 00:37:42 -0400 Date: Wed, 29 Aug 2018 00:37:42 -0400
Subject: [PATCH] Implement Force-Loaded Chunk API Subject: [PATCH] Implement Force-Loaded Chunk API
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 49809372d..2b5b0c4df 100644 index 49809372d8..2b5b0c4df6 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
@@ -3010,6 +3010,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -3010,6 +3010,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -17,7 +17,7 @@ index 49809372d..2b5b0c4df 100644
String s = "chunks"; String s = "chunks";
ForcedChunk forcedchunk = (ForcedChunk) this.a(this.worldProvider.getDimensionManager(), ForcedChunk::new, "chunks"); ForcedChunk forcedchunk = (ForcedChunk) this.a(this.worldProvider.getDimensionManager(), ForcedChunk::new, "chunks");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index 12c6d850d..55394e0c1 100644 index 12c6d850d2..55394e0c15 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -289,6 +289,18 @@ public class CraftChunk implements Chunk { @@ -289,6 +289,18 @@ public class CraftChunk implements Chunk {
@ -40,7 +40,7 @@ index 12c6d850d..55394e0c1 100644
Arrays.fill(emptySkyLight, (byte) 0xFF); Arrays.fill(emptySkyLight, (byte) 0xFF);
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1ccf2a760..755d2632f 100644 index 1ccf2a7609..755d2632fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -609,6 +609,10 @@ public class CraftWorld implements World { @@ -609,6 +609,10 @@ public class CraftWorld implements World {
@ -55,5 +55,5 @@ index 1ccf2a760..755d2632f 100644
public ChunkGenerator getGenerator() { public ChunkGenerator getGenerator() {
-- --
2.19.0.rc1 2.18.0

View File

@ -1,4 +1,4 @@
From e01493d9b51364dc5d48c6ba22ddb19cba25f3d9 Mon Sep 17 00:00:00 2001 From 9b8351eca28bc9eb698984166a7ea89e0eb8c322 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 28 Aug 2018 23:04:15 -0400 Date: Tue, 28 Aug 2018 23:04:15 -0400
Subject: [PATCH] Inventory#removeItemAnySlot Subject: [PATCH] Inventory#removeItemAnySlot

View File

@ -1,4 +1,4 @@
From 7dc2f28d7234646faf52d0f4c7c66e1fd4a6b7ae Mon Sep 17 00:00:00 2001 From 8680a88f33ba22fdceb70ffd3a876f4284244a4b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 29 Aug 2018 21:59:22 -0400 Date: Wed, 29 Aug 2018 21:59:22 -0400
Subject: [PATCH] Optimize getChunkIfLoaded type calls Subject: [PATCH] Optimize getChunkIfLoaded type calls

View File

@ -1,4 +1,4 @@
From 916e4d1edfde6390f74dcf4245fc9a6f5a2c9731 Mon Sep 17 00:00:00 2001 From e882964f631dce6c71f4733d3d354d01fa94d8ca Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 30 Aug 2018 20:56:26 -0400 Date: Thu, 30 Aug 2018 20:56:26 -0400
Subject: [PATCH] Don't double add golems to world Subject: [PATCH] Don't double add golems to world

View File

@ -1,4 +1,4 @@
From d53683a29cf68210c2222eec64a5849ea8382b3a Mon Sep 17 00:00:00 2001 From 1292c431b99d5f7240fe68b46cdc37a30a8e3e14 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 1 Sep 2018 11:29:52 +0100 Date: Sat, 1 Sep 2018 11:29:52 +0100
Subject: [PATCH] fix newlines in spigot tab list API Subject: [PATCH] fix newlines in spigot tab list API

View File

@ -1,4 +1,4 @@
From 9248fae968af8978811a695b5bf6c030499376a8 Mon Sep 17 00:00:00 2001 From 420efcfbfe29045088fac0365c997a4ac120eca4 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com> From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sun, 2 Sep 2018 19:34:33 -0700 Date: Sun, 2 Sep 2018 19:34:33 -0700
Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted