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 2018-08-26 18:48:43 +10:00
parent 4ecffced4c
commit 2440e18926
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 8ac58ef0e79dbde4b2099b5a63d5d922ddf7c8b4 Mon Sep 17 00:00:00 2001
From bc6d5fbafc18ee4ef119d42d5b6f0aec65387ae5 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,12 +37,12 @@ index c3535e90..4ab47d09 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 2237039b..2cebb5c7 100644
index 9ce8ecbc..6392c31b 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1476,6 +1476,14 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1522,6 +1522,14 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force);
+ // Spigot start
+ public class Spigot

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

@ -1,14 +1,14 @@
From 487457f373516887f36645df8f73be11824ba708 Mon Sep 17 00:00:00 2001
From 1605fda249b70897e787b29fd160ad689d3ec587 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 2cebb5c7..61061cc9 100644
index 6392c31b..6c5f11d1 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1480,6 +1480,29 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1526,6 +1526,29 @@ public interface World extends PluginMessageRecipient, Metadatable {
public class Spigot
{

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

@ -1,4 +1,4 @@
From 82025068f12f974323246f6259e79c566b2ca24c Mon Sep 17 00:00:00 2001
From 5f99c530d657d6c173654ce21da373b4bfa36b2e 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 52216ec29..ace730e43 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 303481a0f..0df02a4c8 100644
index 90451598b..e8b06f72f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1607,4 +1607,14 @@ public class CraftWorld implements World {
@@ -1618,4 +1618,14 @@ public class CraftWorld implements World {
cps.unload(chunk);
}
}
@ -180,10 +180,10 @@ index c8654c68f..0c1bca2bd 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 77266427e..05ccadc63 100644
index 7951727ab..e004cc429 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -968,4 +968,16 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
@@ -973,4 +973,16 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
return HANDLED_TAGS;
}
}

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

@ -1,4 +1,4 @@
From 5a751ae26971616b010257a97f71c842f2fd2103 Mon Sep 17 00:00:00 2001
From b0c17d1512b1ff244c62b52645c6717a87fb2dcf 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 e69d6cf55..afbe43dd3 100644
// this.world.a((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 48b1e5729..043419e2d 100644
index 225d25a9f..8addad739 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1618,6 +1618,22 @@ public class CraftWorld implements World {
@@ -1629,6 +1629,22 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{