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 2020-04-22 11:50:25 +10:00
parent e7dc2f5347
commit ab8f6b5af2
5 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CraftBukkit-Patches/0001-POM-Changes.patch
View file

@ -1,4 +1,4 @@
From 86ab085896c2d6265a9f25c8073e76a179be2f6f Mon Sep 17 00:00:00 2001
From 3c69cff0a573deb7d410001d2bbcacb5ad8ca547 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
diff --git a/pom.xml b/pom.xml
index d3a99b076..8837c6074 100644
index fde4cdc0d..fdfe3bf1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
@ -24,7 +24,7 @@ index d3a99b076..8837c6074 100644
<url>https://www.spigotmc.org/</url>
<properties>
@@ -21,10 +21,17 @@
@@ -18,10 +18,17 @@
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
@ -44,10 +44,10 @@ index d3a99b076..8837c6074 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -107,11 +114,26 @@
@@ -104,11 +111,26 @@
<groupId>net.md-5</groupId>
<artifactId>scriptus</artifactId>
<version>0.3.2</version>
<version>0.4.1</version>
- <configuration>
- <format>git-Bukkit-%s</format>
- </configuration>
@ -80,7 +80,7 @@ index d3a99b076..8837c6074 100644
<Implementation-Title>CraftBukkit</Implementation-Title>
- <Implementation-Version>${describe}</Implementation-Version>
+ <Implementation-Version>${spigot.desc}${craftbukkit.desc}</Implementation-Version>
<Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor>
<Implementation-Vendor>${project.build.outputTimestamp}</Implementation-Vendor>
<Specification-Title>Bukkit</Specification-Title>
<Specification-Version>${api.version}</Specification-Version>
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java

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

@ -1,4 +1,4 @@
From baae8c366dd2878ba545aea9417ccbf322b328fa Mon Sep 17 00:00:00 2001
From 7f8b79d0206c8600ed8f12bb4e34b7b762e165dd 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
@ -25,10 +25,10 @@ index 1d7c64d2b..9c9c046e3 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 65b92006b..d9e930672 100644
index 530dd9c83..c6f2c70c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2284,4 +2284,15 @@ public class CraftWorld implements World {
@@ -2290,4 +2290,15 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}

16
CraftBukkit-Patches/0007-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From 1e767acb416bc5f4056a03f6fee48923a93b4420 Mon Sep 17 00:00:00 2001
From 7f06616f08eb73f0891ec87f61186be7048db9a2 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
@ -125,10 +125,10 @@ index 8b039899a..6446de65f 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 d9e930672..c65edb947 100644
index c6f2c70c8..923b46bc5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -379,6 +379,7 @@ public class CraftWorld implements World {
@@ -381,6 +381,7 @@ public class CraftWorld implements World {
@Override
public boolean unloadChunkRequest(int x, int z) {
@ -136,7 +136,7 @@ index d9e930672..c65edb947 100644
net.minecraft.server.IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, false);
if (chunk != null) {
world.getChunkProvider().removeTicket(TicketType.PLUGIN, chunk.getPos(), 1, Unit.INSTANCE);
@@ -388,6 +389,7 @@ public class CraftWorld implements World {
@@ -390,6 +391,7 @@ public class CraftWorld implements World {
}
private boolean unloadChunk0(int x, int z, boolean save) {
@ -144,7 +144,7 @@ index d9e930672..c65edb947 100644
net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, false);
if (chunk == null) {
return true;
@@ -402,6 +404,7 @@ public class CraftWorld implements World {
@@ -404,6 +406,7 @@ public class CraftWorld implements World {
@Override
public boolean regenerateChunk(int x, int z) {
@ -152,7 +152,7 @@ index d9e930672..c65edb947 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)) {
@@ -453,6 +456,7 @@ public class CraftWorld implements World {
@@ -455,6 +458,7 @@ public class CraftWorld implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
@ -160,7 +160,7 @@ index d9e930672..c65edb947 100644
IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
// If generate = false, but the chunk already exists, we will get this back.
@@ -1085,6 +1089,7 @@ public class CraftWorld implements World {
@@ -1091,6 +1095,7 @@ public class CraftWorld implements World {
@Override
public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<Entity> filter) {
@ -168,7 +168,7 @@ index d9e930672..c65edb947 100644
Validate.notNull(boundingBox, "Bounding box is null!");
AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
@@ -1239,6 +1244,7 @@ public class CraftWorld implements World {
@@ -1245,6 +1250,7 @@ public class CraftWorld implements World {
@Override
public void save() {

8
CraftBukkit-Patches/0008-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 6786be174669f22327d695f026ed69d321dba71f Mon Sep 17 00:00:00 2001
From d210b7e571a295dad1cb39f808a3ab03298bf52e 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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 71314e630..b97e1f30a 100644
index f0bf4fd62..13f989cd5 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -125,7 +125,8 @@ public abstract class PlayerList {
@ -41,10 +41,10 @@ index bbe5a08f2..9fc569a14 100644
});
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ff5d0565f..d68979e7d 100644
index 923b46bc5..56b53d51d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2291,6 +2291,13 @@ public class CraftWorld implements World {
@@ -2297,6 +2297,13 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}

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

@ -1,4 +1,4 @@
From 1c245be7f8f5f8f40d57426097084a56b7ecd6c8 Mon Sep 17 00:00:00 2001
From 73369c42057f47bdeafc03086204a384efda50b7 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
@ -41,10 +41,10 @@ index c074d7a40..7c518983a 100644
// this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d68979e7d..16b78bd02 100644
index 56b53d51d..9a43dcb62 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2301,6 +2301,22 @@ public class CraftWorld implements World {
@@ -2307,6 +2307,22 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{