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 2016-04-06 22:46:06 +10:00
parent f6feaaae5b
commit 944aa2003b
8 changed files with 41 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Bukkit-Patches/0006-Add-Particle-API.patch
View file

@ -1,11 +1,11 @@
From 6a7d6bd4e8e3175db58638c137135ed21d50fefa Mon Sep 17 00:00:00 2001
From b1654ad7e863e76d060a7d21c240a56709bdfcf0 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API
diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
index fe29e1c..f28fecd 100644
index ba7dc49..b0f6da7 100644
--- a/src/main/java/org/bukkit/Effect.java
+++ b/src/main/java/org/bukkit/Effect.java
@@ -5,6 +5,7 @@ import java.util.Map;
@ -16,12 +16,10 @@ index fe29e1c..f28fecd 100644
import org.bukkit.potion.Potion;
/**
@@ -79,27 +80,188 @@ public enum Effect {
/**
* The flames seen on a mobspawner; a visual effect.
@@ -196,27 +197,188 @@ public enum Effect {
* The sound of an enderdragon growling
*/
- MOBSPAWNER_FLAMES(2004, Type.VISUAL);
+ MOBSPAWNER_FLAMES(2004, Type.VISUAL),
ENDERDRAGON_GROWL(3001, Type.SOUND),
+ /**
+ * The spark that comes off a fireworks
+ */
@ -165,7 +163,8 @@ index fe29e1c..f28fecd 100644
+ * The particles generated while sprinting a block
+ * This particle requires a Material and data value so that the client can select the correct texture.
+ */
+ TILE_DUST("blockdust", Type.PARTICLE, MaterialData.class);
+ TILE_DUST("blockdust", Type.PARTICLE, MaterialData.class)
;
private final int id;
private final Type type;
@ -209,7 +208,7 @@ index fe29e1c..f28fecd 100644
* @deprecated Magic value
*/
@Deprecated
@@ -108,6 +270,15 @@ public enum Effect {
@@ -225,6 +387,15 @@ public enum Effect {
}
/**
@ -225,7 +224,7 @@ index fe29e1c..f28fecd 100644
* @return The type of the effect.
*/
public Type getType() {
@@ -115,8 +286,7 @@ public enum Effect {
@@ -232,8 +403,7 @@ public enum Effect {
}
/**
@ -235,7 +234,7 @@ index fe29e1c..f28fecd 100644
*/
public Class<?> getData() {
return this.data;
@@ -136,12 +306,32 @@ public enum Effect {
@@ -253,12 +423,32 @@ public enum Effect {
static {
for (Effect effect : values()) {

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

@ -1,4 +1,4 @@
From ab01dd2fbc1cbce86362346ee2fc46708b393d7f Mon Sep 17 00:00:00 2001
From 4a73e447ecc8a86dc3689ad4f39f6d275276673b 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 acf14fd..e4bbe8c 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 86ce61f..a73d184 100644
index 2be8a56..32a0366 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1513,4 +1513,14 @@ public class CraftWorld implements World {
@@ -1517,4 +1517,14 @@ public class CraftWorld implements World {
cps.queueUnload(chunk.locX, chunk.locZ);
}
}
@ -161,5 +161,5 @@ index d3ae91b..0b71b53 100644
+ // Spigot end
}
--
1.9.1
2.5.0

8
CraftBukkit-Patches/0008-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From d18a11e4b063b57f3cbcb86080f9c083e56cf2bd Mon Sep 17 00:00:00 2001
From b99ac1b82820f04af72a31783ccba90d34b215ed 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
@ -106,7 +106,7 @@ index 8b6d2a3..1ab1e04 100644
// this.entityList.addAll(collection);
Iterator iterator = collection.iterator();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a73d184..8ac2b74 100644
index 32a0366..e50e542 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -169,6 +169,7 @@ public class CraftWorld implements World {
@ -125,7 +125,7 @@ index a73d184..8ac2b74 100644
if (isChunkInUse(x, z)) {
return false;
}
@@ -261,6 +263,7 @@ public class CraftWorld implements World {
@@ -265,6 +267,7 @@ public class CraftWorld implements World {
}
public boolean loadChunk(int x, int z, boolean generate) {
@ -181,5 +181,5 @@ index 0000000..4b3aa85
+ }
+}
--
1.9.1
2.5.0

10
CraftBukkit-Patches/0010-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 17d0d3fb6d82e8226e9409708eca24245ce181b4 Mon Sep 17 00:00:00 2001
From 978093117751e2310fdccf89a679b864c7c73858 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -355,7 +355,7 @@ index 4e8e58d..28a28af 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2292e7c..0a40f5a 100644
index 6e42f4d..d918309 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1282,6 +1282,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -586,10 +586,10 @@ index d681258..80f31cf 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8ac2b74..ad224bf 100644
index e50e542..fba75a8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -274,7 +274,9 @@ public class CraftWorld implements World {
@@ -278,7 +278,9 @@ public class CraftWorld implements World {
net.minecraft.server.Chunk chunk = world.getChunkProviderServer().chunks.get(LongHash.toLong(x, z));
if (chunk == null) {
@ -873,5 +873,5 @@ index 55db3ff..220e39a 100644
+ // Spigot end
}
--
1.9.1
2.5.0

12
CraftBukkit-Patches/0053-Particle-API.patch
View file

@ -1,14 +1,14 @@
From 9f4a4c352e1cbf0fa520bd4c69f8cd16c1ba2abc Mon Sep 17 00:00:00 2001
From 4aab5209a8a0bfd5fed183b975871829d110cdd9 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
index 7de0de5..13f9e9d 100644
index 1672183..352ff3a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
@@ -55,6 +55,9 @@ public class CraftEffect {
@@ -58,6 +58,9 @@ public class CraftEffect {
Validate.isTrue(((Material) data).isBlock(), "Material is not a block!");
datavalue = ((Material) data).getId();
break;
@ -19,10 +19,10 @@ index 7de0de5..13f9e9d 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ad224bf..c8568c0 100644
index fba75a8..7f199f9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -869,28 +869,18 @@ public class CraftWorld implements World {
@@ -873,28 +873,18 @@ public class CraftWorld implements World {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@ -60,7 +60,7 @@ index ad224bf..c8568c0 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1521,6 +1511,70 @@ public class CraftWorld implements World {
@@ -1525,6 +1515,70 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{

8
CraftBukkit-Patches/0062-Improve-AutoSave-Mechanism.patch
View file

@ -1,4 +1,4 @@
From 50770eae5b49a39421e26c2bdf48dbff52bfaed8 Mon Sep 17 00:00:00 2001
From bfdaeec600aa3e8d692267460d0ec4ceddadb9ba Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 21:07:18 +1100
Subject: [PATCH] Improve AutoSave Mechanism
@ -37,7 +37,7 @@ index 162613b..83857a6 100644
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index dfe3305..bd2837c 100644
index 66eb75c..075fa13 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -660,7 +660,17 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -60,10 +60,10 @@ index dfe3305..bd2837c 100644
SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c8568c0..03f88f3 100644
index 7f199f9..250b8e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -773,12 +773,17 @@ public class CraftWorld implements World {
@@ -777,12 +777,17 @@ public class CraftWorld implements World {
}
public void save() {

8
CraftBukkit-Patches/0077-Implement-Silenceable-Lightning-API.patch
View file

@ -1,11 +1,11 @@
From a1ffb1768bb535f45ff1b7db66f54816ea97b2ed Mon Sep 17 00:00:00 2001
From 01ca2855b21aadadc987a40031944df0b2e3c15b 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
diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
index 35a0bdc..e507302 100644
index 5a32218..2b1b1e1 100644
--- a/src/main/java/net/minecraft/server/EntityLightning.java
+++ b/src/main/java/net/minecraft/server/EntityLightning.java
@@ -11,6 +11,7 @@ public class EntityLightning extends EntityWeather {
@ -40,10 +40,10 @@ index 35a0bdc..e507302 100644
// this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dc, SoundCategory.d, 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 03f88f3..5ea07c3 100644
index 250b8e9..df3a5cd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1580,6 +1580,22 @@ public class CraftWorld implements World {
@@ -1584,6 +1584,22 @@ public class CraftWorld implements World {
{
CraftWorld.this.playEffect( location, effect, 0 );
}

8
CraftBukkit-Patches/0120-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
View file

@ -1,11 +1,11 @@
From 8c86a2d875f3ce24b0fb2bcc52e26dc2405e735e Mon Sep 17 00:00:00 2001
From 7f448c9d55cbbe18e07d266b676015f7a0ff9677 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 12:49:48 +0100
Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index 06ace47..f74d1b9 100644
index 982b981..d2b3701 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -7,6 +7,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@ -26,10 +26,10 @@ index 06ace47..f74d1b9 100644
EntityOcelot entityocelot = new EntityOcelot(this.world);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 5ea07c3..7b2c289 100644
index df3a5cd..2dcbbab 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1158,6 +1158,12 @@ public class CraftWorld implements World {
@@ -1162,6 +1162,12 @@ public class CraftWorld implements World {
}
if (entity != null) {