spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflicts

Browse source
This commit is contained in:
md_5 2014-12-18 11:14:43 +11:00
parent b43a31a5c2
commit a926b96d5d
25 changed files with 54 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Bukkit-Patches/0019-Add-Spigot-Links.patch
View file

@ -1,29 +0,0 @@
From f3747d42f64987b41461b524c51ab17e19749ef9 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 23 Jan 2014 13:17:38 +1100
Subject: [PATCH] Add Spigot Links
diff --git a/README.md b/README.md
index a51766e..1905b8d 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-Bukkit
+Spigot-API
======
A Minecraft Server API.
-Website: [http://bukkit.org](http://bukkit.org)
-Bugs/Suggestions: [http://leaky.bukkit.org](http://leaky.bukkit.org)
-Contributing Guidelines: [CONTRIBUTING.md](https://github.com/Bukkit/Bukkit/blob/master/CONTRIBUTING.md)
+Website: [http://spigotmc.org](http://spigotmc.org)
+Bugs/Suggestions: [http://www.spigotmc.org/forums/bugs-feature-requests.8/](http://www.spigotmc.org/forums/bugs-feature-requests.8/)
+Contributing Guidelines: [CONTRIBUTING.md](https://github.com/SpigotMC/Spigot-API/blob/master/CONTRIBUTING.md)
Compilation
-----------
--
2.1.0

2
Bukkit-Patches/0020-Implement-Locale-Getter-for-Players.patch → Bukkit-Patches/0019-Implement-Locale-Getter-for-Players.patch
View file

@ -1,4 +1,4 @@
From 382384ef968b8eaef01afb523caa0d2c054f8e36 Mon Sep 17 00:00:00 2001
From 1e0d08aee669a635259637dab0c9c080826339c0 Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:10:49 +1100
Subject: [PATCH] Implement Locale Getter for Players

2
Bukkit-Patches/0021-Add-support-for-fetching-hidden-players.patch → Bukkit-Patches/0020-Add-support-for-fetching-hidden-players.patch
View file

@ -1,4 +1,4 @@
From 2185fb3d84d8548c4a880e86e8686d8dfcb8fed6 Mon Sep 17 00:00:00 2001
From 6ecb4a6c512b1e7b59ce90cd5590d8143d4945b6 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:02:11 -0500
Subject: [PATCH] Add support for fetching hidden players

4
Bukkit-Patches/0022-Silenceable-Lightning-API.patch → Bukkit-Patches/0021-Silenceable-Lightning-API.patch
View file

@ -1,11 +1,11 @@
From 068c3416cfb2542f94308893bfe6932f01870acb Mon Sep 17 00:00:00 2001
From e23df8eaa4782e68587771865fcc80e83c4b3661 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:29 -0400
Subject: [PATCH] Silenceable Lightning API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index a909073..fd399d3 100644
index af3d3c4..1688943 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1212,6 +1212,30 @@ public interface World extends PluginMessageRecipient, Metadatable {

2
Bukkit-Patches/0023-Remove-deprecation-on-some-player-lookup-methods.patch → Bukkit-Patches/0022-Remove-deprecation-on-some-player-lookup-methods.patch
View file

@ -1,4 +1,4 @@
From 3a749aa1121dff4ead2d7eed05e89f15bb76c5ab Mon Sep 17 00:00:00 2001
From 0a4d127362088aa9b6ecc02912240b1ab6e07419 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 30 Mar 2014 15:58:22 +1100
Subject: [PATCH] Remove deprecation on some player lookup methods

2
Bukkit-Patches/0024-Expand-team-API-to-allow-arbitrary-strings.patch → Bukkit-Patches/0023-Expand-team-API-to-allow-arbitrary-strings.patch
View file

@ -1,4 +1,4 @@
From 36b136881620915be2a5eb039c3a9b8c1dc0861b Mon Sep 17 00:00:00 2001
From 2917bb7e6edf204c098fd8c782749ddc478016b1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 17 Apr 2014 19:22:26 +1000
Subject: [PATCH] Expand team API to allow arbitrary strings.

2
Bukkit-Patches/0025-Add-Score.isScoreSet-Z-API.patch → Bukkit-Patches/0024-Add-Score.isScoreSet-Z-API.patch
View file

@ -1,4 +1,4 @@
From 396a8869eb8e9de9089637b76a71234c02d1fdf2 Mon Sep 17 00:00:00 2001
From 4ef8aafa4be2a54f640664267fe4937ac207c8de Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 17 Apr 2014 19:35:13 +1000
Subject: [PATCH] Add Score.isScoreSet()Z API.

2
Bukkit-Patches/0026-Add-PlayerSpawnLocationEvent.patch → Bukkit-Patches/0025-Add-PlayerSpawnLocationEvent.patch
View file

@ -1,4 +1,4 @@
From c3183b435807fa97baad65b698066e9a15a2ae47 Mon Sep 17 00:00:00 2001
From 54614f3c90f80d002c04a5f60d684e6441c05642 Mon Sep 17 00:00:00 2001
From: ninja <xninja@openmailbox.org>
Date: Tue, 8 Apr 2014 14:01:32 +0200
Subject: [PATCH] Add PlayerSpawnLocationEvent.

2
Bukkit-Patches/0027-Ease-ClassLoader-Deadlocks-Where-Possible.patch → Bukkit-Patches/0026-Ease-ClassLoader-Deadlocks-Where-Possible.patch
View file

@ -1,4 +1,4 @@
From 7b22f91f252d08fdad9c53a669f51356fb34db71 Mon Sep 17 00:00:00 2001
From 432070f3e975ce29b7c80621101aec082395081f Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 16 Jul 2014 17:24:21 +1000
Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible

2
Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch → Bukkit-Patches/0027-Fix-slow-tab-complete-for-some-commands.patch
View file

@ -1,4 +1,4 @@
From 69caadfa860617c30596bae5eefc58b7bd1a558e Mon Sep 17 00:00:00 2001
From 6fb7518124366841b3b4cb2c1c448a02fa2114c9 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 22 Jul 2014 21:01:32 +1000
Subject: [PATCH] Fix slow tab complete for some commands.

2
Bukkit-Patches/0029-Undeprecate-Player-updateInventory-V.patch → Bukkit-Patches/0028-Undeprecate-Player-updateInventory-V.patch
View file

@ -1,4 +1,4 @@
From f8e416af1d4903c5086910c7325987dfaac2d619 Mon Sep 17 00:00:00 2001
From ed5331cf5a83cfd03f9508616d966e825727d4df Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu>
Date: Wed, 23 Jul 2014 15:50:36 -0400
Subject: [PATCH] Undeprecate Player#updateInventory()V

2
Bukkit-Patches/0030-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch → Bukkit-Patches/0029-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
View file

@ -1,4 +1,4 @@
From 203a3470d214613a5d1f979290dfc71c308f9596 Mon Sep 17 00:00:00 2001
From e88fc55a74ed297b132e368e303ef7a4f67891e9 Mon Sep 17 00:00:00 2001
From: libraryaddict <redwarfare@live.com>
Date: Fri, 22 Aug 2014 05:31:04 -0400
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta

2
Bukkit-Patches/0031-BungeeCord-Chat-API.patch → Bukkit-Patches/0030-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From b7b8fcaa806f8debf854aa025282d39936d0f357 Mon Sep 17 00:00:00 2001
From a2dc451a1162fd37f78140596abd887e725342d3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 12:59:14 +1100
Subject: [PATCH] BungeeCord Chat API

6
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 6e76a189964cedce034e0b6e9a93f0be832d621c Mon Sep 17 00:00:00 2001
From 6d6600508aa1671f31aba552c12d4aee32488f09 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -104,10 +104,10 @@ index 64e346d..243e8e5 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3b9bfec..e4d0e41 100644
index 6361b44..fed7b4d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1310,4 +1310,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1313,4 +1313,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
collection.add(new AttributeModifiable(getHandle().getAttributeMap(), (new AttributeRanged(null, "generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
}

10
CraftBukkit-Patches/0037-Player-Collision-API.patch
View file

@ -1,11 +1,11 @@
From 94086c5408d66e1ddf9cf3c498c1934195556399 Mon Sep 17 00:00:00 2001
From 8e8e24f2157500392cf8ecd4df26986b730907ee Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 7546107..ecde3d6 100644
index 7eb41e1..b65c225 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -427,6 +427,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -38,7 +38,7 @@ index 6bb5428..2d14a0d 100644
Entity entity = (Entity) list.get(i);
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index b212f29..dc92ccf 100644
index 7af2f28..fcefe68 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -62,6 +62,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -64,10 +64,10 @@ index b212f29..dc92ccf 100644
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
super(worldserver, gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 36469db..d9c0540 100644
index 9268686..dfef8cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1315,6 +1315,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1318,6 +1318,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

8
CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch
View file

@ -1,14 +1,14 @@
From 94d31732d2b54954336f0333af90721d43514e21 Mon Sep 17 00:00:00 2001
From bce30b24c98b7ed3c7966d7cfbe4d15d09252157 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 5 Aug 2013 20:17:20 +1000
Subject: [PATCH] Cap Minimum Player Speed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d9c0540..b8dcea5 100644
index dfef8cb..348b6e2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1179,7 +1179,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1182,7 +1182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setFlySpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();
@ -17,7 +17,7 @@ index d9c0540..b8dcea5 100644
player.updateAbilities();
}
@@ -1188,7 +1188,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1191,7 +1191,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setWalkSpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();

6
CraftBukkit-Patches/0046-Implement-respawn-API.patch
View file

@ -1,14 +1,14 @@
From 76c0cd8eadad79d1d0364139c2460c7292cc0dc7 Mon Sep 17 00:00:00 2001
From d54e960ee49e15b10bbd54010ab2f2ac8d04941b Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b8dcea5..7851f21 100644
index 348b6e2..272f7df 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1328,6 +1328,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1331,6 +1331,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().collidesWithEntities = collides;
getHandle().k = collides; // First boolean of Entity
}

8
CraftBukkit-Patches/0056-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From 1a7b84867f4ee97511cf7cded475159a1991c7e8 Mon Sep 17 00:00:00 2001
From 661d9a1d6d725387d016a63a85a67884ccf5c430 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -119,7 +119,7 @@ index 97920b0..0b86011 100644
this.d = EnumProtocol.a(packetdataserializer.e());
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 3b6e4f0..f0d1ada 100644
index b370b6d..fdb4b3c 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -364,7 +364,7 @@ public abstract class PlayerList {
@ -151,10 +151,10 @@ index ce4857d..5c1cfaa 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7851f21..a05f656 100644
index 272f7df..2841e94 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1317,6 +1317,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1320,6 +1320,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
@Override

6
CraftBukkit-Patches/0061-Particle-API.patch
View file

@ -1,4 +1,4 @@
From 4f5360f49cf6f608d6c7521bf8e46df6da7e03ca Mon Sep 17 00:00:00 2001
From 5e3d4b590b7f29e7f161c14ba275b9a8f99ed426 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
@ -132,10 +132,10 @@ index 3b660ff..eeb1ecb 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a05f656..141391a 100644
index 2841e94..005d20f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1343,6 +1343,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1346,6 +1346,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
}
}

6
CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch
View file

@ -1,14 +1,14 @@
From e921294b6e5ded9724f3cca90c44193e3d9d6b27 Mon Sep 17 00:00:00 2001
From 45eca0436f77e26d507009ad52307ed0519517d3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 15:57:57 +1100
Subject: [PATCH] Disable Connected Check on setScoreboard
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index bec510a..ee4289d 100644
index 005d20f..c7eaca5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1240,7 +1240,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1243,7 +1243,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {

8
CraftBukkit-Patches/0079-Implement-Locale-Getter-for-Players.patch
View file

@ -1,11 +1,11 @@
From 0745f0abfd310c791ef520dded687d7eebaa74c0 Mon Sep 17 00:00:00 2001
From a42afa744e38980e8f3751a2396dcbe000c9b286 Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:12:16 +1100
Subject: [PATCH] Implement Locale Getter for Players
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index f2adc82..9e1981f 100644
index dafd55c..42b68e5 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -27,7 +27,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@ -18,10 +18,10 @@ index f2adc82..9e1981f 100644
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 772f85b..9ce0b2c 100644
index c7eaca5..30025c0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1400,6 +1400,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1403,6 +1403,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket( packet );
}
}

6
CraftBukkit-Patches/0084-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From 62573a7e6dae797956a1e43a78c57fcd93bd7c09 Mon Sep 17 00:00:00 2001
From 2409be65c93259c8475c3e6f9636e8fef584a14d Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:03:03 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9ce0b2c..025bae0 100644
index 30025c0..1e11630 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1406,6 +1406,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1409,6 +1409,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
return getHandle().locale;
}

6
CraftBukkit-Patches/0086-Cap-Channel-Registrations.patch
View file

@ -1,14 +1,14 @@
From dd50c6bd40232a7f970f235cabd621276dfdfe9c Mon Sep 17 00:00:00 2001
From 7b53722e93ea82d5fc6cc5cc597f77fff4e32235 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 20:02:58 +1100
Subject: [PATCH] Cap Channel Registrations
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 025bae0..fa357a0 100644
index 1e11630..856e335 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1060,6 +1060,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1063,6 +1063,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void addChannel(String channel) {

6
CraftBukkit-Patches/0136-Prevent-a-crash-involving-attributes.patch
View file

@ -1,14 +1,14 @@
From 967eec7b6d0f5284862f1cb9c71bed17896390bf Mon Sep 17 00:00:00 2001
From 0a8fa20c8b53fd998621fd4b9a4e6ec3e92fed58 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 19:54:41 +0100
Subject: [PATCH] Prevent a crash involving attributes
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index fa357a0..8700b18 100644
index 856e335..f291a66 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1310,7 +1310,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1313,7 +1313,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
break;
}
}

6
CraftBukkit-Patches/0158-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From 05fe4a53b170c3b9e66d794521448c8e39009056 Mon Sep 17 00:00:00 2001
From a55031efdfc7db45e85a65da6289f56e665d862e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 13:06:05 +1100
Subject: [PATCH] BungeeCord Chat API
@ -91,7 +91,7 @@ index 8b4b580..980dd99 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8700b18..cb65795 100644
index f291a66..9167baf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -18,6 +18,7 @@ import java.util.Set;
@ -102,7 +102,7 @@ index 8700b18..cb65795 100644
import net.minecraft.server.*;
@@ -1427,6 +1428,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1430,6 +1431,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}