spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2022-02-15 09:43:12 +11:00
parent 6edb62f30a
commit 699290cdcc
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
7 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Bukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 6a75f654d1260108750df68549dd6dcc8eb7616a Mon Sep 17 00:00:00 2001
From c378e4bba96b61723436d2cf340298058972e905 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 15 May 2017 15:16:15 +1000
Subject: [PATCH] Skeleton API Implementations
@ -37,10 +37,10 @@ index 9e52461b..839a1833 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 34ee8c05..fdb994a8 100644
index 965a5f3b..d21c4cbe 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2572,6 +2572,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2573,6 +2573,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);

6
Bukkit-Patches/0010-Silenceable-Lightning-API.patch
View file

@ -1,14 +1,14 @@
From 121227fefc939eb7c9a23336bf642730910ea500 Mon Sep 17 00:00:00 2001
From 010fa3dbb8d70a89063bc391e0608fe59d1cdb3e Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
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 fdb994a8..4f0de601 100644
index d21c4cbe..56ce6f1d 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2575,6 +2575,29 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2576,6 +2576,29 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
// Spigot start
public class Spigot {

6
Bukkit-Patches/0015-View-Distance.patch
View file

@ -1,4 +1,4 @@
From ba90413e7858a6b0405cec04461dac1bbc0fb8ea Mon Sep 17 00:00:00 2001
From 158808a2301274a9e8c7fede95a39f44428486b1 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
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 4f0de601..a855f4c1 100644
index 56ce6f1d..81adea0e 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2572,6 +2572,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2573,6 +2573,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);

10
CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 97e30ccd47679d650e6ced1cd801a00551831737 Mon Sep 17 00:00:00 2001
From a24dc686000394715cda50bb7b35c5dbe1780e0f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -27,12 +27,12 @@ index 0eb444280..299628b37 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 902b92cc3..8f9c56ca6 100644
index d5a328df4..2b0cc65a2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1791,4 +1791,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
public DragonBattle getEnderDragonBattle() {
return (getHandle().dragonFight() == null) ? null : new CraftDragonBattle(getHandle().dragonFight());
@@ -1815,4 +1815,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
this.persistentDataContainer.putAll((NBTTagCompound) c);
}
}
+
+ // Spigot start

18
CraftBukkit-Patches/0006-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From dffa29c8de538454e1ac2ad8d4fd7f6f11490bed Mon Sep 17 00:00:00 2001
From aa2b4ef7d2a401263ffb150230c6f06751f58f5d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -42,7 +42,7 @@ index ffe81f657..c8197fa86 100644
Vec3D vec3d = entityplayer.position().subtract(this.entity.position()); // MC-155077, SPIGOT-5113
double d0 = (double) Math.min(this.getEffectiveRange(), (PlayerChunkMap.this.viewDistance - 1) * 16);
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 8da54aacd..417353908 100644
index 634dbaa3c..241fd8f2d 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -966,6 +966,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -134,10 +134,10 @@ index 85a11aa5f..0a8572e62 100644
if (commandMap.dispatch(sender, commandLine)) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8f9c56ca6..272ed6ffb 100644
index 872db116c..e3d501c45 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -246,6 +246,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -253,6 +253,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean unloadChunkRequest(int x, int z) {
@ -145,7 +145,7 @@ index 8f9c56ca6..272ed6ffb 100644
if (isChunkLoaded(x, z)) {
world.getChunkSource().removeRegionTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 1, Unit.INSTANCE);
}
@@ -254,6 +255,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -261,6 +262,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
private boolean unloadChunk0(int x, int z, boolean save) {
@ -153,7 +153,7 @@ index 8f9c56ca6..272ed6ffb 100644
if (!isChunkLoaded(x, z)) {
return true;
}
@@ -268,6 +270,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -275,6 +277,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean regenerateChunk(int x, int z) {
@ -161,7 +161,7 @@ index 8f9c56ca6..272ed6ffb 100644
throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)");
/*
if (!unloadChunk0(x, z, false)) {
@@ -320,6 +323,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -327,6 +330,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
@ -169,7 +169,7 @@ index 8f9c56ca6..272ed6ffb 100644
IChunkAccess chunk = world.getChunkSource().getChunk(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
// If generate = false, but the chunk already exists, we will get this back.
@@ -814,6 +818,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -821,6 +825,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<Entity> filter) {
@ -177,7 +177,7 @@ index 8f9c56ca6..272ed6ffb 100644
Validate.notNull(boundingBox, "Bounding box is null!");
AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
@@ -968,6 +973,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -975,6 +980,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public void save() {

10
CraftBukkit-Patches/0007-View-Distance.patch
View file

@ -1,4 +1,4 @@
From cfbfc1ee63fa612908d4cdf7a15aac5343af73a2 Mon Sep 17 00:00:00 2001
From b52cacccca72d41370c6ed18c650d27dfddfaa47 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance
@ -6,7 +6,7 @@ Subject: [PATCH] View Distance
This commit allows the user to select per world view distances.
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 417353908..4c8da0281 100644
index 241fd8f2d..34d10a7bd 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -250,8 +250,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -44,11 +44,11 @@ index ddf7d5e39..d5f7290ac 100644
entityplayer1.unsetRemoved();
entityplayer1.connection.teleport(new Location(worldserver1.getWorld(), entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot()));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 272ed6ffb..8c945d3d9 100644
index e3d501c45..d3a38888a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1798,6 +1798,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return (getHandle().dragonFight() == null) ? null : new CraftDragonBattle(getHandle().dragonFight());
@@ -1822,6 +1822,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
}
+ // Spigot start

6
CraftBukkit-Patches/0049-Implement-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From df2b26d3def7a50238071321d9762b60f9d31106 Mon Sep 17 00:00:00 2001
From c3c251037f233f6ef96f9f9f3b878cb28705584d Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@ -26,10 +26,10 @@ index 95985a722..9170b85e3 100644
this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEffects.LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F, false);
this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEffects.LIGHTNING_BOLT_IMPACT, SoundCategory.WEATHER, 2.0F, 0.5F + this.random.nextFloat() * 0.2F, false);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8c945d3d9..8d549e120 100644
index d3a38888a..760d514b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1813,6 +1813,26 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1837,6 +1837,26 @@ public class CraftWorld extends CraftRegionAccessor implements World {
// Spigot start
private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
{