diff options
| author | md_5 <git@md-5.net> | 2017-07-24 17:41:08 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-07-24 17:44:44 +1000 |
| commit | 4670a84bd9db26b4fd013f723f2089ae570ec9ae (patch) | |
| tree | 9748fc96f6e2df9931227b4d4969b547fe341130 /src | |
| parent | f078eed54b23d480eacb0b6f50b1468d5c8c81c5 (diff) | |
| download | craftbukkit-4670a84bd9db26b4fd013f723f2089ae570ec9ae.tar craftbukkit-4670a84bd9db26b4fd013f723f2089ae570ec9ae.tar.gz craftbukkit-4670a84bd9db26b4fd013f723f2089ae570ec9ae.tar.lz craftbukkit-4670a84bd9db26b4fd013f723f2089ae570ec9ae.tar.xz craftbukkit-4670a84bd9db26b4fd013f723f2089ae570ec9ae.zip | |
SPIGOT-3432: Add playNote support for new sounds
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 30 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java | 2 |
2 files changed, 32 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 4764e70a..b400b535 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -265,6 +265,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { case 4: instrumentName = "bass"; break; + case 5: + instrumentName = "flute"; + break; + case 6: + instrumentName = "bell"; + break; + case 7: + instrumentName = "guitar"; + break; + case 8: + instrumentName = "chime"; + break; + case 9: + instrumentName = "xylophone"; + break; } float f = (float) Math.pow(2.0D, (note - 12.0D) / 12.0D); @@ -292,6 +307,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { case 4: instrumentName = "bass"; break; + case 5: + instrumentName = "flute"; + break; + case 6: + instrumentName = "bell"; + break; + case 7: + instrumentName = "guitar"; + break; + case 8: + instrumentName = "chime"; + break; + case 9: + instrumentName = "xylophone"; + break; } float f = (float) Math.pow(2.0D, (note.getId() - 12.0D) / 12.0D); getHandle().playerConnection.sendPacket(new PacketPlayOutNamedSoundEffect(CraftSound.getSoundEffect("block.note." + instrumentName), net.minecraft.server.SoundCategory.MUSIC, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), 3.0f, f)); diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java index 84826ee0..8a5249c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java @@ -1,6 +1,7 @@ package org.bukkit.craftbukkit.util.permissions;
import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
import org.bukkit.util.permissions.DefaultPermissions;
public final class CraftDefaultPermissions {
@@ -11,6 +12,7 @@ public final class CraftDefaultPermissions { public static void registerCorePermissions() {
Permission parent = DefaultPermissions.registerPermission(ROOT, "Gives the user the ability to use all vanilla utilities and commands");
CommandPermissions.registerPermissions(parent);
+ DefaultPermissions.registerPermission(ROOT + ".autocraft", "Gives the user the ability to use autocraft functionality", PermissionDefault.OP, parent);
parent.recalculatePermissibles();
}
}
|