update upstream
This commit is contained in:
parent
6d166798e6
commit
566740114e
79 changed files with 450 additions and 459 deletions
|
@ -1,4 +1,4 @@
|
|||
From c2dcfe42c36ad71eafe754ab961333e503857c34 Mon Sep 17 00:00:00 2001
|
||||
From e7fbb2f0ff337833ec0432d97ec1a3a453af9bb2 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
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 6709168b..99080b27 100644
|
||||
index 805faaf35..d68fd9a2b 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 6709168b..99080b27 100644
|
|||
import org.bukkit.Achievement;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Effect;
|
||||
@@ -1711,6 +1712,19 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1758,6 +1759,19 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
* was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
|
||||
*/
|
||||
boolean hasResourcePack();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue