core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Update to latest and rebuild ALL patches" 

This reverts commit 141ef5a6dc.
This commit is contained in:
Zach Brown 2016-03-06 14:49:47 -06:00
parent 141ef5a6dc
commit a34a886ff7
8 changed files with 22 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit f714a0eb175d1619a7847946cdea1056649cd597
Subproject commit 5fa44fc1a10ad8b3efca62ef0429aadce253c8bc

10
Bukkit-Patches/0006-Add-Particle-API.patch
View File

@ -1,11 +1,11 @@
From b6fdf411e3a24e17404cb252249b8c4224b50a60 Mon Sep 17 00:00:00 2001
From 8dda3b718e25ff37aea6e807af0070d78a6d43a4 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 2474a2d..37f29e2 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;
@ -271,10 +271,10 @@ index fe29e1c..f28fecd 100644
+ public enum Type {SOUND, VISUAL, PARTICLE}
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 58f4431..ec6a3a5 100644
index 5cc1fec..5ce8f05 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1173,6 +1173,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1159,6 +1159,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean isGameRule(String rule);
@ -365,5 +365,5 @@ index 08aa71d..5217aec 100644
}
}
--
2.7.2
2.5.0

8
Bukkit-Patches/0020-Silenceable-Lightning-API.patch
View File

@ -1,14 +1,14 @@
From 1f77fb1d96d11655b2f1c6bfb05da62871b4d4dd Mon Sep 17 00:00:00 2001
From aa93d11f7bf75114678d117ff6716ac053fbfa7a 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 ec6a3a5..bafba90 100644
index 5ce8f05..4125633 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1218,6 +1218,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1204,6 +1204,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@ -66,5 +66,5 @@ index c8b5154..1ed4ac9 100644
+ Spigot spigot();
}
--
2.7.2
2.5.0

2
CraftBukkit

@ -1 +1 @@
Subproject commit 935349e3a39e3d39403afef0e750710fdc396d2a
Subproject commit b6bb6beb63c794a74076b68686ea2298f1f51450

4
CraftBukkit-Patches/0010-Spigot-Timings.patch
View File

@ -1,4 +1,4 @@
From 0330ffc3004d34bed74a8f1191983d99b869b9f0 Mon Sep 17 00:00:00 2001
From a5e080be0b23f8bfacc9d1405d8161ca731f36c0 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
@ -873,5 +873,5 @@ index 55db3ff..220e39a 100644
+ // Spigot end
}
--
2.7.2
2.5.0

4
CraftBukkit-Patches/0145-Use-Map-for-getPlayer-String-lookup.patch
View File

@ -1,4 +1,4 @@
From 14d0af10eb46cd420984baf65ae1de900fededc2 Mon Sep 17 00:00:00 2001
From 9b75f018a3dccb9510ac120fda821a1b64e3d0b1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 13 Jul 2015 19:05:15 +1000
Subject: [PATCH] Use Map for getPlayer(String) lookup.
@ -115,5 +115,5 @@ index 0000000..1934fd5
+ }
+}
--
2.7.2
2.5.0

14
Spigot-Server-Patches/0075-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From adff2c9b22dcde53256df2c2cee850729b056df1 Mon Sep 17 00:00:00 2001
From 64d63acdd2ab0ce767bffc9c1e7f683d21932ce0 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 03:15:41 -0600
Subject: [PATCH] Add exception reporting event
@ -50,7 +50,7 @@ index 0000000..9339718
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 6d148d7..b6d84d7 100644
index f0c464b..e0c0a26 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -1,5 +1,6 @@
@ -89,7 +89,7 @@ index 6d148d7..b6d84d7 100644
}
}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 49288c9..9ef6246 100644
index 1f99e85..71ab040 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -4,6 +4,7 @@ import java.io.IOException;
@ -100,7 +100,7 @@ index 49288c9..9ef6246 100644
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -226,7 +227,11 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -221,7 +222,11 @@ public class ChunkProviderServer implements IChunkProvider {
return chunk;
} catch (Exception exception) {
@ -113,7 +113,7 @@ index 49288c9..9ef6246 100644
return null;
}
}
@@ -235,7 +240,11 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -230,7 +235,11 @@ public class ChunkProviderServer implements IChunkProvider {
try {
this.chunkLoader.b(this.world, chunk);
} catch (Exception exception) {
@ -126,7 +126,7 @@ index 49288c9..9ef6246 100644
}
}
@@ -245,9 +254,14 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -240,9 +249,14 @@ public class ChunkProviderServer implements IChunkProvider {
chunk.setLastSaved(this.world.getTime());
this.chunkLoader.a(this.world, chunk);
} catch (IOException ioexception) {
@ -292,7 +292,7 @@ index 320e52e..d40257f 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 8f5700f..1b076b6 100644
index 1c95c96..75b0d89 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,7 @@

32
Spigot-Server-Patches/0077-Re-add-playSound-in-CraftWorld.patch
View File

@ -1,32 +0,0 @@
From 32d4f7dafab4e62891e0c353c83fe8a65e4272ed Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 6 Mar 2016 14:31:04 -0600
Subject: [PATCH] Re-add playSound in CraftWorld
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 9e75cb6..c0246a0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1357,6 +1357,18 @@ public class CraftWorld implements World {
getHandle().a(null, x, y, z, CraftSound.getSoundEffect(CraftSound.getSound(sound)), SoundCategory.MASTER, volume, pitch); // PAIL: rename
}
+ // Paper - This is getting removed somewhere/somehow and preventing a build from compiling
+ public void playSound(Location loc, String sound, float volume, float pitch) {
+ if (loc == null || sound == null) return;
+
+ double x = loc.getX();
+ double y = loc.getY();
+ double z = loc.getZ();
+
+ PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(sound, SoundCategory.MASTER, x, y, z, volume, pitch);
+ world.getMinecraftServer().getPlayerList().sendPacketNearby(null, x, y, z, volume > 1.0F ? 16.0F * volume : 16.0D, this.world.dimension, packet);
+ }
+
public String getGameRuleValue(String rule) {
return getHandle().getGameRules().get(rule);
}
--
2.7.2