mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-03 06:01:39 +01:00
Update to latest and rebuild ALL patches
This commit is contained in:
parent
f42ce21433
commit
21038c6f5c
2
Bukkit
2
Bukkit
@ -1 +1 @@
|
||||
Subproject commit 5fa44fc1a10ad8b3efca62ef0429aadce253c8bc
|
||||
Subproject commit f714a0eb175d1619a7847946cdea1056649cd597
|
@ -1 +1 @@
|
||||
Subproject commit b6bb6beb63c794a74076b68686ea2298f1f51450
|
||||
Subproject commit 935349e3a39e3d39403afef0e750710fdc396d2a
|
30
Spigot-Server-Patches/Re-add-playSound-in-CraftWorld.patch
Normal file
30
Spigot-Server-Patches/Re-add-playSound-in-CraftWorld.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <1254957+zachbr@users.noreply.github.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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -0,0 +0,0 @@ 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);
|
||||
}
|
||||
--
|
Loading…
Reference in New Issue
Block a user