From 69a4a30e478932cf647577a345600e61825ba912 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 12 Oct 2018 03:11:50 -0400 Subject: [PATCH] [CI-SKIP] [Auto] Rebuild Patches A recent commit has been made that caused patches to be out of order, rebuilding --- .../{0162-Turtle-API.patch => 0163-Turtle-API.patch} | 10 +++++----- .../{0390-Turtle-API.patch => 0391-Turtle-API.patch} | 2 +- ...imize-DataFixer-Bootstrap-to-prebuild-faster.patch} | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename Spigot-API-Patches/{0162-Turtle-API.patch => 0163-Turtle-API.patch} (97%) rename Spigot-Server-Patches/{0390-Turtle-API.patch => 0391-Turtle-API.patch} (99%) rename Spigot-Server-Patches/{0391-Optimize-DataFixer-Bootstrap-to-prebuild-faster.patch => 0392-Optimize-DataFixer-Bootstrap-to-prebuild-faster.patch} (97%) diff --git a/Spigot-API-Patches/0162-Turtle-API.patch b/Spigot-API-Patches/0163-Turtle-API.patch similarity index 97% rename from Spigot-API-Patches/0162-Turtle-API.patch rename to Spigot-API-Patches/0163-Turtle-API.patch index addd0a63e..bda8d683c 100644 --- a/Spigot-API-Patches/0162-Turtle-API.patch +++ b/Spigot-API-Patches/0163-Turtle-API.patch @@ -1,4 +1,4 @@ -From ac7a829da50e58d282ff7582a88eb9269d74a52d Mon Sep 17 00:00:00 2001 +From 2b4c99b420dceb1f6c57d19416ba20d1eee8005b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 28 Sep 2018 17:08:09 -0500 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 new file mode 100644 -index 00000000..11248ee9 +index 000000000..11248ee93 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java @@ -0,0 +1,45 @@ @@ -57,7 +57,7 @@ index 00000000..11248ee9 +} 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 -index 00000000..7cb00f78 +index 000000000..7cb00f78d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java @@ -0,0 +1,81 @@ @@ -144,7 +144,7 @@ index 00000000..7cb00f78 +} 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 -index 00000000..5d53ee08 +index 000000000..5d53ee08b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java @@ -0,0 +1,57 @@ @@ -206,7 +206,7 @@ index 00000000..5d53ee08 + } +} diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java -index 0a4cd299..e547eead 100644 +index 0a4cd2993..e547eead4 100644 --- a/src/main/java/org/bukkit/entity/Turtle.java +++ b/src/main/java/org/bukkit/entity/Turtle.java @@ -1,6 +1,53 @@ diff --git a/Spigot-Server-Patches/0390-Turtle-API.patch b/Spigot-Server-Patches/0391-Turtle-API.patch similarity index 99% rename from Spigot-Server-Patches/0390-Turtle-API.patch rename to Spigot-Server-Patches/0391-Turtle-API.patch index 6013b0418..4c4ba89a2 100644 --- a/Spigot-Server-Patches/0390-Turtle-API.patch +++ b/Spigot-Server-Patches/0391-Turtle-API.patch @@ -1,4 +1,4 @@ -From 368755767af6fb3ba3707c284e89bde2021a9ff5 Mon Sep 17 00:00:00 2001 +From 05a6a13bb24d6e81ed9d39bf740f9c161c960885 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 29 Sep 2018 16:08:23 -0500 Subject: [PATCH] Turtle API diff --git a/Spigot-Server-Patches/0391-Optimize-DataFixer-Bootstrap-to-prebuild-faster.patch b/Spigot-Server-Patches/0392-Optimize-DataFixer-Bootstrap-to-prebuild-faster.patch similarity index 97% rename from Spigot-Server-Patches/0391-Optimize-DataFixer-Bootstrap-to-prebuild-faster.patch rename to Spigot-Server-Patches/0392-Optimize-DataFixer-Bootstrap-to-prebuild-faster.patch index f1b36aff3..c92b4faf3 100644 --- a/Spigot-Server-Patches/0391-Optimize-DataFixer-Bootstrap-to-prebuild-faster.patch +++ b/Spigot-Server-Patches/0392-Optimize-DataFixer-Bootstrap-to-prebuild-faster.patch @@ -1,4 +1,4 @@ -From 757fd2730e797d31f71492826e972f9a49dbe8ac Mon Sep 17 00:00:00 2001 +From 3c2d443821191fe49500c40d6c4634b59e5af892 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 12 Oct 2018 01:28:32 -0400 Subject: [PATCH] Optimize DataFixer Bootstrap to prebuild faster