mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update upstream B/CB

Browse source
This commit is contained in:
Zach Brown 2016-12-16 15:00:16 -06:00
parent f087ac45e3
commit 1d8b7e2ecc
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
12 changed files with 37 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0003-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From d01fb3a2f5dbe0d60e5d7bfd25c16a040df5315e Mon Sep 17 00:00:00 2001
From db5fdbf9e4aa5d4ae6de2c73e045656da6d057ed 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
@ -3278,10 +3278,10 @@ index a8f61f2..0000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 36094b5..b4a4ed5 100644
index 6299843..64c35df 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1440,6 +1440,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1455,6 +1455,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.");
}
@ -3656,5 +3656,5 @@ index 8d98297..7e89b97 100644
- }
}
--
2.10.2
2.9.3

8
Spigot-API-Patches/0004-Player-affects-spawning-API.patch
View file

@ -1,14 +1,14 @@
From ccafae7c8b4e1ef3a9fece0582e1a2cacddddd00 Mon Sep 17 00:00:00 2001
From 1bb24ae5896681760710bb23bb083d0efdcc9c71 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 b4a4ed5..b725fac 100644
index 64c35df..6443f65 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1329,6 +1329,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1344,6 +1344,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@ -30,5 +30,5 @@ index b4a4ed5..b725fac 100644
public class Spigot extends Entity.Spigot
{
--
2.10.2
2.9.3

8
Spigot-API-Patches/0010-Add-player-view-distance-API.patch
View file

@ -1,14 +1,14 @@
From 756f2d46975a869851859538a647c075dcbac53f Mon Sep 17 00:00:00 2001
From eb40756df6e39375611efba72fa447f576574c86 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 b725fac..bca09f0 100644
index 6443f65..ebe727a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1343,6 +1343,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1358,6 +1358,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setAffectsSpawning(boolean affects);
@ -30,5 +30,5 @@ index b725fac..bca09f0 100644
public class Spigot extends Entity.Spigot
{
--
2.10.2
2.9.3

15
Spigot-API-Patches/0017-Player-Tab-List-and-Title-APIs.patch
View file

@ -1,4 +1,4 @@
From a33f233aea81e64704c2257ecb21570d9f340d59 Mon Sep 17 00:00:00 2001
From 20302a2aa7ce4804ef279e8c927a6915b7f59a15 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 0000000..e1ecd44
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 3295674..9f67d09 100644
index 27e0f07..50b4fb2 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;
@ -497,15 +497,6 @@ index 3295674..9f67d09 100644
// Paper end
/**
@@ -1156,7 +1267,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* Resets the title displayed to the player.
* @deprecated API subject to change.
*/
- @Deprecated
+ // Paper - undeprecate
public void resetTitle();
--
2.10.2
2.9.3

8
Spigot-API-Patches/0022-Complete-resource-pack-API.patch
View file

@ -1,11 +1,11 @@
From 0ad996239d917bd7aa348a18cf373706991644e1 Mon Sep 17 00:00:00 2001
From 699be1d39a7401d680acf2d47ab0defa3c33a536 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 5b7ca6a..ac58f3a 100644
index 1fe4794..bf4c31b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1166,7 +1166,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -18,7 +18,7 @@ index 5b7ca6a..ac58f3a 100644
public void setResourcePack(String url);
/**
@@ -1494,6 +1496,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1509,6 +1511,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setViewDistance(int viewDistance);
@ -110,5 +110,5 @@ index 4c49801..4c83851 100644
* Gets the status of this pack.
*
--
2.10.2
2.9.3

6
Spigot-Server-Patches/0005-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 8f95cad119243c2ee4e76eb203befbf1dbae752f Mon Sep 17 00:00:00 2001
From 420dd4451f220787698f1560b1383752c5ed3116 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@ -1602,7 +1602,7 @@ index 3a95b44..b5efb9c 100644
public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index feeaa9a..fbd7df9 100644
index d057cce..877a0c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@ -1622,7 +1622,7 @@ index feeaa9a..fbd7df9 100644
import org.bukkit.craftbukkit.map.CraftMapView;
import org.bukkit.craftbukkit.map.RenderData;
import org.bukkit.craftbukkit.scoreboard.CraftScoreboard;
@@ -1586,6 +1580,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1594,6 +1588,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
packet.components = components;
getHandle().playerConnection.sendPacket(packet);
}

8
Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
View file

@ -1,4 +1,4 @@
From 40e274b8cc9da2292c708066e4f5206814d82701 Mon Sep 17 00:00:00 2001
From 8511153bd8600f68521b299b00e1ce03e1d6992b Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API
@ -70,10 +70,10 @@ index 52171a3..3d70c50 100644
if (d3 < 0.0D || d4 < d3 * d3) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index fbd7df9..54542ee 100644
index 877a0c8..5e9834c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1449,6 +1449,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1457,6 +1457,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
@ -91,5 +91,5 @@ index fbd7df9..54542ee 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.10.2
2.9.3

6
Spigot-Server-Patches/0037-Add-player-view-distance-API.patch
View file

@ -1,4 +1,4 @@
From 7082ace40e5fdcd0eb3cea5d68d9d9ff9f20992f Mon Sep 17 00:00:00 2001
From 4674b438eaca643fc5ced705ce51804c45410d52 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 14:35:27 -0600
Subject: [PATCH] Add player view distance API
@ -194,10 +194,10 @@ index c546139..ef8744b 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a9c2677..4ba6e35 100644
index 3e4e080..318b460 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1460,6 +1460,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1468,6 +1468,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().affectsSpawning;
}

6
Spigot-Server-Patches/0068-Complete-resource-pack-API.patch
View file

@ -1,4 +1,4 @@
From bbb98127842e91bf2359e4abe639c2e87dc079e7 Mon Sep 17 00:00:00 2001
From 2c3f33cf991b20a34238a2472472a37b70134149 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
@ -24,7 +24,7 @@ index 878a79e..687a8e6 100644
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b3084b7..5be1a6f 100644
index e7b04c2..9ef6ba2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -38,7 +38,7 @@ index b3084b7..5be1a6f 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1566,6 +1570,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1574,6 +1578,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
}

6
Spigot-Server-Patches/0124-Implement-PlayerLocaleChangeEvent.patch
View file

@ -1,4 +1,4 @@
From 8a7da10a7e66a93a4f182344c9ff8993ad0ec429 Mon Sep 17 00:00:00 2001
From 08431e50cbf5dfd8f360139eb351c008e7c00a77 Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent
@ -34,10 +34,10 @@ index 9662ea0..518283f 100644
this.ch = packetplayinsettings.d();
this.getDataWatcher().set(EntityPlayer.bq, Byte.valueOf((byte) packetplayinsettings.e()));
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1a4603d..ffb7341 100644
index f16fe84..72bf7fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1697,7 +1697,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1705,7 +1705,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale()
{

2
work/Bukkit

@ -1 +1 @@
Subproject commit 1603bcf467683f1303dc6f2d5f95908deec1b74d
Subproject commit 703a1cf8353492f83c8b2c1bfd61bc618254c085

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 4f479728ee68a15a6d2df78fce8cf9e514e43b65
Subproject commit 0a6a5cb4ad97482e62f612b56199fb85bffc2171