diff --git a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch index c499e711..3132140a 100644 --- a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 34c70b87c3771bf1af1299cac9ad7b1ae458f7ff Mon Sep 17 00:00:00 2001 +From b710a6aae69b7b9940749d2be09dfcc80058db75 Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 15 May 2017 15:16:15 +1000 Subject: [PATCH] Skeleton API Implementations @@ -37,10 +37,10 @@ index d5aafa0e..afe2047b 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 3240d101..502cbafb 100644 +index b6eccdf8..068ab07c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -2372,6 +2372,15 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2381,6 +2381,15 @@ public interface World extends PluginMessageRecipient, Metadatable { @Nullable public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored); diff --git a/Bukkit-Patches/0010-Silenceable-Lightning-API.patch b/Bukkit-Patches/0010-Silenceable-Lightning-API.patch index 65ce5ec2..81691ec2 100644 --- a/Bukkit-Patches/0010-Silenceable-Lightning-API.patch +++ b/Bukkit-Patches/0010-Silenceable-Lightning-API.patch @@ -1,14 +1,14 @@ -From cbdfe7643ca36e627963281162c97cd8636e6ca4 Mon Sep 17 00:00:00 2001 +From dd3424e7446ad9dd2f4235595d8fc815285a5733 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:29 -0400 Subject: [PATCH] Silenceable Lightning API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 502cbafb..d5930022 100644 +index 068ab07c..5fc4a951 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -2375,6 +2375,29 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2384,6 +2384,29 @@ public interface World extends PluginMessageRecipient, Metadatable { // Spigot start public class Spigot { diff --git a/Bukkit-Patches/0015-View-Distance.patch b/Bukkit-Patches/0015-View-Distance.patch index 25ce7689..a3bf077d 100644 --- a/Bukkit-Patches/0015-View-Distance.patch +++ b/Bukkit-Patches/0015-View-Distance.patch @@ -1,4 +1,4 @@ -From b15299dee5a18b57587b71a06d978d6c62691b99 Mon Sep 17 00:00:00 2001 +From b7a087c2bbb722d4dc1226385e2e7aba072b5f0a Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 30 Jul 2019 13:47:34 -0700 Subject: [PATCH] View Distance @@ -6,10 +6,10 @@ Subject: [PATCH] View Distance This commit allows the retrieval of per world view distances. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index d5930022..fd2af5fd 100644 +index 5fc4a951..0fcf1dbb 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -2372,6 +2372,15 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -2381,6 +2381,15 @@ public interface World extends PluginMessageRecipient, Metadatable { @Nullable public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored); diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch index a3737fe2..c8632d7f 100644 --- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 5136d5908a6ee0c2bb22df90a94e7e5ce173bb02 Mon Sep 17 00:00:00 2001 +From b40709b2926ce034e64db9ad1dde3286eaf6db85 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -27,10 +27,10 @@ index 985b7115f..dcd99a51d 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 97fcafb57..dd6378d4c 100644 +index bb244f9f5..1d555e7e5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2347,4 +2347,15 @@ public class CraftWorld implements World { +@@ -2352,4 +2352,15 @@ public class CraftWorld implements World { public DragonBattle getEnderDragonBattle() { return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle()); } diff --git a/CraftBukkit-Patches/0008-View-Distance.patch b/CraftBukkit-Patches/0008-View-Distance.patch index c2398449..c5b280d0 100644 --- a/CraftBukkit-Patches/0008-View-Distance.patch +++ b/CraftBukkit-Patches/0008-View-Distance.patch @@ -1,4 +1,4 @@ -From 0df3576f811ad8f1b1338f05777acf90d97fab5d Mon Sep 17 00:00:00 2001 +From 5ea8ab1df36ffb2d332c3909bc34459dbf0f8158 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance @@ -41,10 +41,10 @@ index 09c5dddb8..ab572c1a5 100644 entityplayer1.dead = false; entityplayer1.playerConnection.teleport(new Location(worldserver1.getWorld(), entityplayer1.locX(), entityplayer1.locY(), entityplayer1.locZ(), entityplayer1.yaw, entityplayer1.pitch)); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index afde4ba69..e5a5ab24e 100644 +index 2675543bf..73c657cdd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2354,6 +2354,13 @@ public class CraftWorld implements World { +@@ -2359,6 +2359,13 @@ public class CraftWorld implements World { return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle()); } diff --git a/CraftBukkit-Patches/0009-Spigot-Timings.patch b/CraftBukkit-Patches/0009-Spigot-Timings.patch index 323f8abe..d60f81fe 100644 --- a/CraftBukkit-Patches/0009-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0009-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From ce55f797c576c607edd06a4e6bc6541d5b23607f Mon Sep 17 00:00:00 2001 +From b026944385ea09e62d73ab3cb7c19318cf26f061 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -358,7 +358,7 @@ index 5e12a79b2..d31497d7a 100644 protected BlockPosition ap() { diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java -index 7dfaec9dd..3fe059ead 100644 +index 5d97c425e..68983080c 100644 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java @@ -135,6 +135,8 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -395,7 +395,7 @@ index 7dfaec9dd..3fe059ead 100644 + SpigotTimings.timerEntityTickRest.stopTiming(); // Spigot } - public void updateEquipment() { // PAIL private->public; updateEquipment + public void updateEquipment() { @@ -2758,6 +2764,7 @@ public abstract class EntityLiving extends Entity { this.setMot(d4, d5, d6); diff --git a/CraftBukkit-Patches/0051-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0051-Implement-Silenceable-Lightning-API.patch index d788f247..f51b3301 100644 --- a/CraftBukkit-Patches/0051-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0051-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 8ed59218c9fbf8c6d447f69ca152caddc6180765 Mon Sep 17 00:00:00 2001 +From a337b5b1e55da26416012ccd00f84ebc7c667394 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API @@ -26,10 +26,10 @@ index 7a12a4666..8946fcd93 100644 if (enumdifficulty == EnumDifficulty.NORMAL || enumdifficulty == EnumDifficulty.HARD) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e5a5ab24e..5c488c8a4 100644 +index 73c657cdd..15b59891d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2364,6 +2364,26 @@ public class CraftWorld implements World { +@@ -2369,6 +2369,26 @@ public class CraftWorld implements World { // Spigot start private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot() {