Update B/CB/S
This commit is contained in:
parent
70caa048a8
commit
a693cb21ab
28 changed files with 128 additions and 128 deletions
|
@ -1,4 +1,4 @@
|
|||
From ca6ed8efa01a2413602e10e9d81b8187aee6013a Mon Sep 17 00:00:00 2001
|
||||
From 5d5dc477a6998af553a15def100d0ef1407b6dba Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 29 Feb 2016 18:48:17 -0600
|
||||
Subject: [PATCH] Timings v2
|
||||
|
@ -3488,10 +3488,10 @@ index bba914d7..00000000
|
|||
- // Spigot end
|
||||
-}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 8af5f849..f4eff6b7 100644
|
||||
index 965f4207..2c7a17df 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1520,6 +1520,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1543,6 +1543,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||
throw new UnsupportedOperationException("Not supported yet.");
|
||||
}
|
||||
|
@ -3866,5 +3866,5 @@ index 8d982974..7e89b97b 100644
|
|||
- }
|
||||
}
|
||||
--
|
||||
2.14.3
|
||||
2.15.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From a4b6a1c41d153da1b0abb5c370ba6bac5ad62b86 Mon Sep 17 00:00:00 2001
|
||||
From 257154fddcfc4106bb12364b1f54b18f09beb062 Mon Sep 17 00:00:00 2001
|
||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||
Date: Mon, 29 Feb 2016 17:22:34 -0600
|
||||
Subject: [PATCH] Player affects spawning API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index d2a78f56..e429e701 100644
|
||||
index 2c7a17df..313dde80 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1415,6 +1415,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1438,6 +1438,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
*/
|
||||
public String getLocale();
|
||||
|
||||
|
@ -30,5 +30,5 @@ index d2a78f56..e429e701 100644
|
|||
public class Spigot extends Entity.Spigot
|
||||
{
|
||||
--
|
||||
2.13.0.windows.1
|
||||
2.15.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 50f65fe293c945c2cdfb52ca3bdf07c422f54423 Mon Sep 17 00:00:00 2001
|
||||
From 7c0c42257e29ed95c6de268ff1c754d7b233c844 Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Mon, 29 Feb 2016 18:05:37 -0600
|
||||
Subject: [PATCH] Add player view distance API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index e429e701..7fcc7aea 100644
|
||||
index 313dde80..5a02b2e8 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1429,6 +1429,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1452,6 +1452,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
*/
|
||||
public void setAffectsSpawning(boolean affects);
|
||||
|
||||
|
@ -30,5 +30,5 @@ index e429e701..7fcc7aea 100644
|
|||
public class Spigot extends Entity.Spigot
|
||||
{
|
||||
--
|
||||
2.13.0.windows.1
|
||||
2.15.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From d80dbb15c8d5511bb0a05fb63f58ef9818bcf5f0 Mon Sep 17 00:00:00 2001
|
||||
From 9dd9b637954219c83778c62a4b4eb58dc8e05ae6 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Mon, 29 Feb 2016 19:54:32 -0600
|
||||
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
|
|||
Change Javadoc to be accurate
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 5147cbda..9af61bad 100644
|
||||
index 39523ea7..73157ff9 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -278,6 +278,26 @@ public final class Bukkit {
|
||||
|
@ -37,7 +37,7 @@ index 5147cbda..9af61bad 100644
|
|||
* Gets the name of the update folder. The update folder is used to safely
|
||||
* update plugins at the right moment on a plugin load.
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index ed3a7197..a5750304 100644
|
||||
index 28ea20ef..18549ce0 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -226,6 +226,26 @@ public interface Server extends PluginMessageRecipient {
|
||||
|
@ -68,10 +68,10 @@ index ed3a7197..a5750304 100644
|
|||
* Gets the name of the update folder. The update folder is used to safely
|
||||
* update plugins at the right moment on a plugin load.
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index dd9a6b2b..7e3e3b7f 100644
|
||||
index 5a02b2e8..52e11da5 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -393,6 +393,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -394,6 +394,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
*/
|
||||
public void sendMap(MapView map);
|
||||
|
||||
|
@ -109,5 +109,5 @@ index dd9a6b2b..7e3e3b7f 100644
|
|||
* Forces an update of the player's entire inventory.
|
||||
*
|
||||
--
|
||||
2.11.0
|
||||
2.15.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 2a34bc238c64b2b4729d088b3f937949e2a3857a Mon Sep 17 00:00:00 2001
|
||||
From e73a0072c224fe5f288fc7e8fdc11945c339e1cd Mon Sep 17 00:00:00 2001
|
||||
From: Techcable <Techcable@outlook.com>
|
||||
Date: Mon, 29 Feb 2016 20:02:40 -0600
|
||||
Subject: [PATCH] Player Tab List and Title APIs
|
||||
|
@ -369,7 +369,7 @@ index 00000000..3c2b63db
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index dc593801..993abc13 100644
|
||||
index 52e11da5..1a172aa1 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -2,6 +2,7 @@ package org.bukkit.entity;
|
||||
|
@ -380,7 +380,7 @@ index dc593801..993abc13 100644
|
|||
import org.bukkit.Achievement;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Effect;
|
||||
@@ -421,6 +422,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -422,6 +423,116 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||
spigot().sendMessage(position, components);
|
||||
}
|
||||
|
@ -498,5 +498,5 @@ index dc593801..993abc13 100644
|
|||
|
||||
/**
|
||||
--
|
||||
2.13.0.windows.1
|
||||
2.15.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c90eb35aed8c00523955820c86367fbbe5e39b0c Mon Sep 17 00:00:00 2001
|
||||
From dde946c97f9cdee15d021fbc985506491d8970e2 Mon Sep 17 00:00:00 2001
|
||||
From: kashike <kashike@vq.lc>
|
||||
Date: Tue, 8 Mar 2016 13:05:59 -0800
|
||||
Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender
|
||||
|
@ -40,10 +40,10 @@ index abf68a2c..fcb03b83 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 34a9d696..78f877d9 100644
|
||||
index 1a172aa1..32b495fd 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -400,6 +400,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -401,6 +401,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
*
|
||||
* @param component the components to send
|
||||
*/
|
||||
|
@ -51,7 +51,7 @@ index 34a9d696..78f877d9 100644
|
|||
public default void sendMessage(net.md_5.bungee.api.chat.BaseComponent component) {
|
||||
spigot().sendMessage(component);
|
||||
}
|
||||
@@ -409,6 +410,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -410,6 +411,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
*
|
||||
* @param components the components to send
|
||||
*/
|
||||
|
@ -60,5 +60,5 @@ index 34a9d696..78f877d9 100644
|
|||
spigot().sendMessage(components);
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
2.15.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 30c7e1eb9b2001b9dbe9ee911896660c67b63eda Mon Sep 17 00:00:00 2001
|
||||
From bb7bbe6c985fed6e6923c89acf68ded7fa53ba93 Mon Sep 17 00:00:00 2001
|
||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||
Date: Sat, 4 Apr 2015 22:59:54 -0400
|
||||
Subject: [PATCH] Complete resource pack API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 1fc83b57..f04e2541 100644
|
||||
index 32b495fd..5ca1a7b2 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1185,7 +1185,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1208,7 +1208,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
* @throws IllegalArgumentException Thrown if the URL is null.
|
||||
* @throws IllegalArgumentException Thrown if the URL is too long. The
|
||||
* length restriction is an implementation specific arbitrary value.
|
||||
|
@ -18,7 +18,7 @@ index 1fc83b57..f04e2541 100644
|
|||
public void setResourcePack(String url);
|
||||
|
||||
/**
|
||||
@@ -1586,6 +1588,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1609,6 +1611,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
*/
|
||||
public void setViewDistance(int viewDistance);
|
||||
|
||||
|
@ -110,5 +110,5 @@ index 4c498016..4c838519 100644
|
|||
* Gets the status of this pack.
|
||||
*
|
||||
--
|
||||
2.13.0.windows.1
|
||||
2.15.0
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From c1f59bafd368616b4cbf133847cb243aeedafe46 Mon Sep 17 00:00:00 2001
|
||||
From 2f60a21de6c259e424793e74209695f7e036852c Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 20 Dec 2016 15:55:55 -0500
|
||||
Subject: [PATCH] Add String based Action Bar API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index f04e2541..72c85452 100644
|
||||
index 5ca1a7b2..4478d84d 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -395,6 +395,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -396,6 +396,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
public void sendMap(MapView map);
|
||||
|
||||
// Paper start
|
||||
|
@ -35,7 +35,7 @@ index f04e2541..72c85452 100644
|
|||
/**
|
||||
* Sends the component to the player
|
||||
*
|
||||
@@ -418,9 +438,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -419,9 +439,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
/**
|
||||
* Sends an array of components as a single message to the specified screen position of this player
|
||||
*
|
||||
|
@ -47,7 +47,7 @@ index f04e2541..72c85452 100644
|
|||
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||
spigot().sendMessage(position, components);
|
||||
}
|
||||
@@ -1728,9 +1750,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1751,9 +1773,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
/**
|
||||
* Sends the component to the specified screen position of this player
|
||||
*
|
||||
|
@ -59,7 +59,7 @@ index f04e2541..72c85452 100644
|
|||
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) {
|
||||
throw new UnsupportedOperationException("Not supported yet.");
|
||||
}
|
||||
@@ -1738,9 +1762,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1761,9 +1785,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
/**
|
||||
* Sends an array of components as a single message to the specified screen position of this player
|
||||
*
|
||||
|
@ -72,5 +72,5 @@ index f04e2541..72c85452 100644
|
|||
throw new UnsupportedOperationException("Not supported yet.");
|
||||
}
|
||||
--
|
||||
2.13.0.windows.1
|
||||
2.15.0
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c951f10585428331ded76330d1363aef859b66b5 Mon Sep 17 00:00:00 2001
|
||||
From a1287cf6e3c7863a7d815a7951b355c2b7bfa58a Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Sat, 10 Jun 2017 16:59:40 -0500
|
||||
Subject: [PATCH] Fix upstream javadoc warnings and errors
|
||||
|
@ -21,10 +21,10 @@ index 9597a9d8..478f2c3c 100644
|
|||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index 68388416..c69619da 100644
|
||||
index 8d29dcbd..0bc47dd6 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -1405,6 +1405,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1407,6 +1407,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
* @param count the number of particles
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -32,7 +32,7 @@ index 68388416..c69619da 100644
|
|||
*/
|
||||
public <T> void spawnParticle(Particle particle, Location location, int count, T data);
|
||||
|
||||
@@ -1420,6 +1421,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1422,6 +1423,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
* @param count the number of particles
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -40,7 +40,7 @@ index 68388416..c69619da 100644
|
|||
*/
|
||||
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
|
||||
|
||||
@@ -1469,6 +1471,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1471,6 +1473,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
* @param offsetZ the maximum random offset on the Z axis
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -48,7 +48,7 @@ index 68388416..c69619da 100644
|
|||
*/
|
||||
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
|
||||
|
||||
@@ -1488,6 +1491,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1490,6 +1493,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
* @param offsetZ the maximum random offset on the Z axis
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -56,7 +56,7 @@ index 68388416..c69619da 100644
|
|||
*/
|
||||
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
|
||||
|
||||
@@ -1543,6 +1547,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1545,6 +1549,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
* particle used (normally speed)
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -64,7 +64,7 @@ index 68388416..c69619da 100644
|
|||
*/
|
||||
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
|
||||
|
||||
@@ -1564,6 +1569,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1566,6 +1571,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
* particle used (normally speed)
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -112,10 +112,10 @@ index cfce8fa5..8660070b 100644
|
|||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index a80b4599..0c3eb03f 100644
|
||||
index 4478d84d..39684300 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -410,7 +410,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -411,7 +411,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
*
|
||||
* Use supplied alternative character to the section symbol to represent legacy color codes.
|
||||
*
|
||||
|
@ -124,7 +124,7 @@ index a80b4599..0c3eb03f 100644
|
|||
* @param message The message to send
|
||||
*/
|
||||
public void sendActionBar(char alternateChar, String message);
|
||||
@@ -477,6 +477,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -478,6 +478,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
/**
|
||||
* Update the subtitle of titles displayed to the player
|
||||
*
|
||||
|
@ -132,7 +132,7 @@ index a80b4599..0c3eb03f 100644
|
|||
* @deprecated Use {@link #updateTitle(Title)}
|
||||
*/
|
||||
@Deprecated
|
||||
@@ -485,6 +486,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -486,6 +487,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
/**
|
||||
* Update the subtitle of titles displayed to the player
|
||||
*
|
||||
|
@ -140,7 +140,7 @@ index a80b4599..0c3eb03f 100644
|
|||
* @deprecated Use {@link #updateTitle(Title)}
|
||||
*/
|
||||
@Deprecated
|
||||
@@ -493,6 +495,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -494,6 +496,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
/**
|
||||
* Show the given title to the player, along with the last subtitle set, using the last set times
|
||||
*
|
||||
|
@ -148,7 +148,7 @@ index a80b4599..0c3eb03f 100644
|
|||
* @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
|
||||
*/
|
||||
@Deprecated
|
||||
@@ -501,6 +504,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -502,6 +505,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
/**
|
||||
* Show the given title to the player, along with the last subtitle set, using the last set times
|
||||
*
|
||||
|
@ -156,7 +156,7 @@ index a80b4599..0c3eb03f 100644
|
|||
* @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
|
||||
*/
|
||||
@Deprecated
|
||||
@@ -1399,6 +1403,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1422,6 +1426,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
* @param count the number of particles
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -164,7 +164,7 @@ index a80b4599..0c3eb03f 100644
|
|||
*/
|
||||
public <T> void spawnParticle(Particle particle, Location location, int count, T data);
|
||||
|
||||
@@ -1414,6 +1419,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1437,6 +1442,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
* @param count the number of particles
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -172,7 +172,7 @@ index a80b4599..0c3eb03f 100644
|
|||
*/
|
||||
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
|
||||
|
||||
@@ -1463,6 +1469,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1486,6 +1492,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
* @param offsetZ the maximum random offset on the Z axis
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -180,7 +180,7 @@ index a80b4599..0c3eb03f 100644
|
|||
*/
|
||||
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
|
||||
|
||||
@@ -1482,6 +1489,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1505,6 +1512,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
* @param offsetZ the maximum random offset on the Z axis
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -188,7 +188,7 @@ index a80b4599..0c3eb03f 100644
|
|||
*/
|
||||
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
|
||||
|
||||
@@ -1537,6 +1545,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1560,6 +1568,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
* particle used (normally speed)
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
@ -196,7 +196,7 @@ index a80b4599..0c3eb03f 100644
|
|||
*/
|
||||
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
|
||||
|
||||
@@ -1558,6 +1567,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1581,6 +1590,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
* particle used (normally speed)
|
||||
* @param data the data to use for the particle or null,
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From a5fb4cfb4fb3e299ad9d232c9fc6b815f56544d5 Mon Sep 17 00:00:00 2001
|
||||
From 2d0f0d8b881b61178c0b87ce0f71c9855c79be60 Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Tue, 10 Oct 2017 18:44:42 +0200
|
||||
Subject: [PATCH] Expose client protocol version and virtual host
|
||||
|
@ -55,10 +55,10 @@ index 00000000..9072e384
|
|||
+
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 0c3eb03f..611a5be2 100644
|
||||
index 39684300..23cc8b5e 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -29,7 +29,7 @@ import org.bukkit.scoreboard.Scoreboard;
|
||||
@@ -30,7 +30,7 @@ import org.bukkit.scoreboard.Scoreboard;
|
||||
/**
|
||||
* Represents a player, connected or not
|
||||
*/
|
||||
|
@ -68,5 +68,5 @@ index 0c3eb03f..611a5be2 100644
|
|||
/**
|
||||
* Gets the "friendly" name to display of this player. This may include
|
||||
--
|
||||
2.14.2
|
||||
2.15.0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue