diff options
author | Max Lee <mail@moep.tv> | 2017-02-14 14:00:30 +0100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2017-02-15 10:05:56 +1100 |
commit | 4c8d8955138fc54a487e3ee36a0c7c1e50cfeba8 (patch) | |
tree | 4f41750293b17cfe1bc99920de21725b7b8bd810 /src/main/java/org | |
parent | 2683195ecdd4ed3b35edd4e26cd3d4b6ba06d16c (diff) | |
download | craftbukkit-4c8d8955138fc54a487e3ee36a0c7c1e50cfeba8.tar craftbukkit-4c8d8955138fc54a487e3ee36a0c7c1e50cfeba8.tar.gz craftbukkit-4c8d8955138fc54a487e3ee36a0c7c1e50cfeba8.tar.lz craftbukkit-4c8d8955138fc54a487e3ee36a0c7c1e50cfeba8.tar.xz craftbukkit-4c8d8955138fc54a487e3ee36a0c7c1e50cfeba8.zip |
SPIGOT-2152: Method to set resource pack + hash.
Diffstat (limited to 'src/main/java/org')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 11 |
1 files changed, 11 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 9f0b0654..5ba18e68 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; +import com.google.common.io.BaseEncoding; import com.mojang.authlib.GameProfile; import io.netty.buffer.Unpooled; @@ -14,6 +15,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.UUID; @@ -1094,6 +1096,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().setResourcePack(url, "null"); } + @Override + public void setResourcePack(String url, byte[] hash) { + Validate.notNull(url, "Resource pack URL cannot be null"); + Validate.notNull(hash, "Resource pack hash cannot be null"); + Validate.isTrue(hash.length == 20, "Resource pack hash should be 20 bytes long but was " + hash.length); + + getHandle().setResourcePack(url, BaseEncoding.base16().lowerCase().encode(hash)); + } + public void addChannel(String channel) { if (channels.add(channel)) { server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel)); |