[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-10-11 21:46:35 -04:00
parent ee7933e43e
commit dc6dbeb6ad
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
5 changed files with 16 additions and 16 deletions

View File

@ -1,4 +1,4 @@
From 86b386e1158f061a25df7b3b0a5bd56102252ce9 Mon Sep 17 00:00:00 2001 From 3e7f07dfd47c8f38beaf2ee8ae0aea44118cb396 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 00:54:15 -0500 Date: Sun, 7 Oct 2018 00:54:15 -0500
Subject: [PATCH] Add sun related API Subject: [PATCH] Add sun related API
@ -44,5 +44,5 @@ index 48eddcd3..1b108a4a 100644
/** /**
-- --
2.19.0 2.19.1

View File

@ -1,4 +1,4 @@
From c4faeffafb0e89f4d82a5ab47f7fb2fc33778d6c Mon Sep 17 00:00:00 2001 From ac7a829da50e58d282ff7582a88eb9269d74a52d Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 28 Sep 2018 17:08:09 -0500 Date: Fri, 28 Sep 2018 17:08:09 -0500
Subject: [PATCH] Turtle API Subject: [PATCH] Turtle API
@ -6,7 +6,7 @@ Subject: [PATCH] Turtle API
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
new file mode 100644 new file mode 100644
index 000000000..11248ee93 index 00000000..11248ee9
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
@ -57,7 +57,7 @@ index 000000000..11248ee93
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
new file mode 100644 new file mode 100644
index 000000000..7cb00f78d index 00000000..7cb00f78
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
@@ -0,0 +1,81 @@ @@ -0,0 +1,81 @@
@ -144,7 +144,7 @@ index 000000000..7cb00f78d
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
new file mode 100644 new file mode 100644
index 000000000..5d53ee08b index 00000000..5d53ee08
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
@ -206,7 +206,7 @@ index 000000000..5d53ee08b
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java
index 0a4cd2993..e547eead4 100644 index 0a4cd299..e547eead 100644
--- a/src/main/java/org/bukkit/entity/Turtle.java --- a/src/main/java/org/bukkit/entity/Turtle.java
+++ b/src/main/java/org/bukkit/entity/Turtle.java +++ b/src/main/java/org/bukkit/entity/Turtle.java
@@ -1,6 +1,53 @@ @@ -1,6 +1,53 @@

View File

@ -1,11 +1,11 @@
From e5f5534561fd40c2ef90e938c165c549e42a3e04 Mon Sep 17 00:00:00 2001 From cbec382ff91dda37675216bd80ca2e0ebf6c56e5 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 00:54:21 -0500 Date: Sun, 7 Oct 2018 00:54:21 -0500
Subject: [PATCH] Add sun related API Subject: [PATCH] Add sun related API
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 56542d531..6c84ec964 100644 index 56542d531a..6c84ec9640 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
@@ -1287,6 +1287,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -1287,6 +1287,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -17,10 +17,10 @@ index 56542d531..6c84ec964 100644
if (this.world.L() && !this.world.isClientSide) { if (this.world.L() && !this.world.isClientSide) {
float f = this.az(); float f = this.az();
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 d659ffe9b..9d0b553a0 100644 index 2b54834ce0..3b53020fc2 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
@@ -828,6 +828,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -829,6 +829,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
} }
} }
@ -29,7 +29,7 @@ index d659ffe9b..9d0b553a0 100644
return this.G < 4; return this.G < 4;
} }
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 02b6bf299..7a66a4af8 100644 index 02b6bf2990..7a66a4af87 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
@@ -542,6 +542,12 @@ public class CraftWorld implements World { @@ -542,6 +542,12 @@ public class CraftWorld implements World {
@ -46,7 +46,7 @@ index 02b6bf299..7a66a4af8 100644
return createExplosion(x, y, z, power, false, true); return createExplosion(x, y, z, power, false, true);
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
index 53c2d154e..40a429942 100644 index 53c2d154ed..40a429942e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
@@ -68,4 +68,10 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { @@ -68,4 +68,10 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
@ -61,5 +61,5 @@ index 53c2d154e..40a429942 100644
+ // Paper end + // Paper end
} }
-- --
2.19.0 2.19.1

View File

@ -1,4 +1,4 @@
From 30dc41248cfbebbe35948fbb92c867989a7fb6cc Mon Sep 17 00:00:00 2001 From ff1651ba6a682b466f8759d1f08484093191af86 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Wed, 10 Oct 2018 21:22:44 -0500 Date: Wed, 10 Oct 2018 21:22:44 -0500
Subject: [PATCH] Check Drowned for Villager Aggression Config Subject: [PATCH] Check Drowned for Villager Aggression Config

View File

@ -1,4 +1,4 @@
From 46cd5a86127305a559c95969f0a0c5b86074247d Mon Sep 17 00:00:00 2001 From 368755767af6fb3ba3707c284e89bde2021a9ff5 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 29 Sep 2018 16:08:23 -0500 Date: Sat, 29 Sep 2018 16:08:23 -0500
Subject: [PATCH] Turtle API Subject: [PATCH] Turtle API