Paper/Spigot-Server-Patches/0061-Complete-resource-pack-API.patch

58 lines
2.1 KiB
Diff
Raw Normal View History

2018-09-01 18:09:13 +08:00
From 22ccbf55c661d74d594b10f808239aff3eb18850 Mon Sep 17 00:00:00 2001
2016-03-09 14:23:59 +08:00
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2018-09-01 18:09:13 +08:00
index 42ee0efc1b..cd32239132 100644
2016-03-09 14:23:59 +08:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2018-07-30 00:42:07 +08:00
@@ -128,6 +128,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2016-03-09 14:23:59 +08:00
private double health = 20;
private boolean scaledHealth = false;
private double healthScale = 20;
+ // Paper start
+ private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
+ private String resourcePackHash;
+ // Paper end
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
2018-09-01 18:09:13 +08:00
@@ -1752,6 +1756,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().server.getCommandDispatcher().a(getHandle());
2016-03-09 14:23:59 +08:00
}
2016-03-09 14:23:59 +08:00
+ @Override
+ public void setResourcePack(String url, String hash) {
+ Validate.notNull(url, "Resource pack URL cannot be null");
+ Validate.notNull(hash, "Hash cannot be null");
+ this.getHandle().setResourcePack(url, hash);
+ }
+
+ @Override
+ public org.bukkit.event.player.PlayerResourcePackStatusEvent.Status getResourcePackStatus() {
+ return this.resourcePackStatus;
+ }
+
+ @Override
+ public String getResourcePackHash() {
+ return this.resourcePackHash;
+ }
+
+ @Override
+ public boolean hasResourcePack() {
+ return this.resourcePackStatus == org.bukkit.event.player.PlayerResourcePackStatusEvent.Status.SUCCESSFULLY_LOADED;
+ }
+
2016-06-09 11:57:14 +08:00
+ public void setResourcePackStatus(org.bukkit.event.player.PlayerResourcePackStatusEvent.Status status) {
2016-03-09 14:23:59 +08:00
+ this.resourcePackStatus = status;
+ }
+
2016-03-09 14:23:59 +08:00
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{
2016-03-09 14:23:59 +08:00
--
2.18.0
2016-03-09 14:23:59 +08:00