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

76 lines
3.5 KiB
Diff
Raw Normal View History

2017-08-03 16:36:06 +02:00
From f41e730aab7129fd783861b1a6d57c838b9f58e4 Mon Sep 17 00:00:00 2001
2016-03-09 07:23:59 +01: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/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2017-08-03 16:36:06 +02:00
index 4f784742c..a6436a8e0 100644
2016-03-09 07:23:59 +01:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2017-08-03 16:36:06 +02:00
@@ -1061,7 +1061,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
2016-03-09 07:23:59 +01:00
// CraftBukkit start
public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
2017-03-15 15:32:50 +01:00
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.x());
2016-03-09 07:23:59 +01:00
- this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()]));
+ // Paper start
2017-03-15 15:32:50 +01:00
+ //this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()]));
2016-03-09 07:23:59 +01:00
+ final PlayerResourcePackStatusEvent.Status status = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
2016-06-09 05:57:14 +02:00
+ this.getPlayer().setResourcePackStatus(status);
+ this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), status));
2017-03-15 15:32:50 +01:00
+ // Paper end
2016-03-09 07:23:59 +01:00
}
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2017-07-24 13:47:43 +02:00
index 7e95ec70f..d5c53032a 100644
2016-03-09 07:23:59 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2017-05-28 06:25:17 +02:00
@@ -81,6 +81,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2016-03-09 07:23:59 +01: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);
2017-07-24 13:47:43 +02:00
@@ -1592,6 +1596,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2016-03-09 07:23:59 +01:00
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
}
2016-03-09 07:23:59 +01: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 05:57:14 +02:00
+ public void setResourcePackStatus(org.bukkit.event.player.PlayerResourcePackStatusEvent.Status status) {
2016-03-09 07:23:59 +01:00
+ this.resourcePackStatus = status;
+ }
+
2016-03-09 07:23:59 +01:00
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{
2016-03-09 07:23:59 +01:00
--
2017-07-24 13:47:43 +02:00
2.13.3.windows.1
2016-03-09 07:23:59 +01:00