aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2018-11-24 05:28:04 +0000
committerShane Freeder <[email protected]>2018-11-24 05:28:04 +0000
commit29a01de126bf9bdb061a382849de7a7f60aa50da (patch)
tree3c0e1415bd14c196ab76e9f9ab543a73abc578a6 /Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
parente73ace252e1104424673938eb66d3dd187413dd0 (diff)
downloadPaper-29a01de126bf9bdb061a382849de7a7f60aa50da.tar.gz
Paper-29a01de126bf9bdb061a382849de7a7f60aa50da.zip
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9a793cce Remove no longer applicable caveats to setPlayerListName 7137829e SPIGOT-4496: Undeprecate MapView.getId and make int de33ade0 Remove some draft API designations a35fa838 SPIGOT-4472: Add Consumer scheduler methods CraftBukkit Changes: 8cd538e6 SPIGOT-4498: Crash on startup b4ee04ba SPIGOT-4496: Undeprecate MapView.getId and make int ec937d0e SPIGOT-4472: Add Consumer scheduler methods Spigot Changes: a1f2566f Use monotonic time for watchdog bc4adcbf SPIGOT-4498: Crash on startup bb387e6c Rebuild patches
Diffstat (limited to 'Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch')
-rw-r--r--Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
index be288b43c5..6c7cef9d5b 100644
--- a/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
+++ b/Spigot-API-Patches/0087-Player.setPlayerProfile-API.patch
@@ -1,4 +1,4 @@
-From 493eccb7661a318e36ec70b8fe8162a2a136db14 Mon Sep 17 00:00:00 2001
+From ee7e882548af6130d040e4a16132a155e44be107 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Sun, 18 Mar 2018 12:28:55 -0400
Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
This can be useful for changing name or skins after a player has logged in.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 575791cf7..6f87abb91 100644
+index 5f3e085e3..1e349066d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index 575791cf7..6f87abb91 100644
import org.bukkit.Achievement;
import org.bukkit.ChatColor;
import org.bukkit.Effect;
-@@ -1772,6 +1773,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1756,6 +1757,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
*/
boolean hasResourcePack();