mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-15 07:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix patches from camera API

Browse Source
This commit is contained in:
md_5 2015-06-09 09:16:01 +10:00 committed by Zach Brown
parent b537fcb6cd
commit b59cf404af
24 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Bukkit-Patches/0004-BungeeCord-Support.patch
View File

@ -1,17 +1,17 @@
From 3583afb047a67596bbb720659a18e2cb7fe2d6cf Mon Sep 17 00:00:00 2001
From e2de26074e47e4b5395e447ce838424d51c1b65b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:20:49 +1000
Subject: [PATCH] BungeeCord Support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1d0daaf..4d5df12 100644
index c10ffa1..6d435d3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1035,4 +1035,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @see Player#setHealthScaled(boolean)
@@ -1046,4 +1046,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* {@link GameMode#SPECTATOR}
*/
public double getHealthScale();
public void setSpectatorTarget(Entity entity);
+
+ // Spigot start
+ public class Spigot extends Entity.Spigot

6
Bukkit-Patches/0006-Add-Particle-API.patch
View File

@ -1,4 +1,4 @@
From d36e3167d05889a0550cb8619a3e006eb4fa3385 Mon Sep 17 00:00:00 2001
From e81b734874b999f611343b37baa63e8daee38707 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API
@ -332,10 +332,10 @@ index 127ad9d..6613286 100644
* Gets the world border for this world.
*
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4d5df12..9b9676e 100644
index 6d435d3..49b53ac 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1050,6 +1050,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1061,6 +1061,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0012-Player-Collision-API.patch
View File

@ -1,14 +1,14 @@
From 50902f491aee86ed6c8fbf37e331dbd670427bb7 Mon Sep 17 00:00:00 2001
From 7aff8c19e086c661dd6c026f3dd09ab39afa3211 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:20:50 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9b9676e..3830926 100644
index 49b53ac..29992f0 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1055,6 +1055,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1066,6 +1066,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0015-Add-respawn-API.patch
View File

@ -1,14 +1,14 @@
From 180cc2c3b3b88ad2dce7765e001870ffb9b26849 Mon Sep 17 00:00:00 2001
From e6f1923042dd703d84725f437ef9fed81588b484 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:35:58 +0200
Subject: [PATCH] Add respawn API.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 3830926..c8110fb 100644
index 29992f0..d8a4b67 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1076,6 +1076,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1087,6 +1087,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
View File

@ -1,14 +1,14 @@
From 2ed86fd19fa6146e1183c0f2af6ed9326f71be9d Mon Sep 17 00:00:00 2001
From 9251378c4372bcb6df2367fcad83be94413f57a7 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
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index c8110fb..dc108f2 100644
index d8a4b67..84e6f20 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1084,6 +1084,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1095,6 +1095,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
View File

@ -1,14 +1,14 @@
From 64f289718617d9d41047c022adfbc21a68d291a2 Mon Sep 17 00:00:00 2001
From db6c1b27104654f3e40e0aa8a9da607eeb1e639f 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
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index dc108f2..24956d1 100644
index 84e6f20..2d67970 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1094,6 +1094,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1105,6 +1105,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch
View File

@ -1,14 +1,14 @@
From ae0e8af3697605661785760ebad7c0dc0de118cd Mon Sep 17 00:00:00 2001
From 249eb8be0d33847f7d0cde8fd493d63870ddb29f 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
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 24956d1..40fbb53 100644
index 2d67970..7a0815c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -332,10 +332,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -333,10 +333,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Forces an update of the player's entire inventory.
*

8
Bukkit-Patches/0028-BungeeCord-Chat-API.patch
View File

@ -1,11 +1,11 @@
From e58d48c30fb2fa251e6f386eed2716acdce5f802 Mon Sep 17 00:00:00 2001
From 4b32a5b07e36e10190b36d00109a8955d731198a 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
diff --git a/pom.xml b/pom.xml
index c3b3d47..c90fd6e 100644
index dc430c0..f0ceea5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,14 @@
@ -53,10 +53,10 @@ index 52dd005..20edb77 100644
Spigot spigot();
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 40fbb53..b86b85d 100644
index 7a0815c..83cc008 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1102,6 +1102,24 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1113,6 +1113,24 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

14
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View File

@ -1,4 +1,4 @@
From 82f2612342c62a617ed24e51c326de4a07f50b96 Mon Sep 17 00:00:00 2001
From 12ef1389396b4a8488c6abba12e60fb841714f88 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,12 +104,12 @@ 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 e229dc0..9396b93 100644
index 82e2a90..b3c428b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -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)));
@@ -1320,4 +1320,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
Preconditions.checkArgument(getGameMode() == GameMode.SPECTATOR, "Player must be in spectator mode");
getHandle().setSpectatorTarget((entity == null) ? null : ((CraftEntity) entity).getHandle());
}
+
+ // Spigot start
@ -124,10 +124,10 @@ index e229dc0..9396b93 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 8b18e1f..8c4f734 100644
index 5f123e3..f0a6002 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -819,4 +819,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -818,4 +818,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
return HANDLED_TAGS;
}
}

10
CraftBukkit-Patches/0009-Async-Operation-Catching.patch
View File

@ -1,4 +1,4 @@
From 82faee6fc499cc962324e115723cac63afacbd07 Mon Sep 17 00:00:00 2001
From dd9dfa3800108e16a922d3dcc27b4644c367fc1b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -26,7 +26,7 @@ index 6b02059..66e099f 100644
public int a(Random random) {
return 1;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 40ae494..2e81b7e 100644
index ca28b72..8125cb9 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -570,6 +570,7 @@ public abstract class EntityLiving extends Entity {
@ -38,7 +38,7 @@ index 40ae494..2e81b7e 100644
if (isTickingEffects) {
effectsToProcess.add(mobeffect);
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index 1cc9c95..de38e80 100644
index 7a76dd0..e1ff4f0 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -94,6 +94,7 @@ public class EntityTracker {
@ -134,10 +134,10 @@ index 80fc5bf..441f8a3 100644
if (generate) {
// Use the default variant of loadChunk when generate == true.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9396b93..fa7b91c 100644
index b3c428b..098a0d8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -215,6 +215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {

12
CraftBukkit-Patches/0036-Player-Collision-API.patch
View File

@ -1,11 +1,11 @@
From f24cf33ea473b8f916f320b7796aa3be623226c8 Mon Sep 17 00:00:00 2001
From 920351331bf866635c2199b4dea47c5450c4ef0a 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 4012570..32dd2e1 100644
index fe26522..d1e6e53 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 {
@ -25,7 +25,7 @@ index 4012570..32dd2e1 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index f7ce391..9cd8e9b 100644
index e3a9e44..6a0b22a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1674,7 +1674,7 @@ public abstract class EntityLiving extends Entity {
@ -38,7 +38,7 @@ index f7ce391..9cd8e9b 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 9b2e06a..2fab7d1 100644
index e707dd7..b0681cf 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 9b2e06a..2fab7d1 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 fa7b91c..671b7d2 100644
index 098a0d8..0ef7321 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1318,6 +1318,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1325,6 +1325,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

8
CraftBukkit-Patches/0039-Cap-Minimum-Player-Speed.patch
View File

@ -1,14 +1,14 @@
From 8ad8cfeb5ef3607ff7df88c3418e482344e46055 Mon Sep 17 00:00:00 2001
From b72d66e19b46ff1d5e57f70051f8ac4524b77ec0 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 671b7d2..5136adf 100644
index 0ef7321..99cac72 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1182,7 +1182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1183,7 +1183,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setFlySpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();
@ -17,7 +17,7 @@ index 671b7d2..5136adf 100644
player.updateAbilities();
}
@@ -1191,7 +1191,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1192,7 +1192,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setWalkSpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();

6
CraftBukkit-Patches/0045-Implement-respawn-API.patch
View File

@ -1,14 +1,14 @@
From 902b948750e522a34c9b0837d2d0e308fd6a05f3 Mon Sep 17 00:00:00 2001
From c76b2749bc0cb7d994cccf365d6c55677fabb721 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 5136adf..a5b7b75 100644
index 99cac72..7935f4f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1331,6 +1331,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1338,6 +1338,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().collidesWithEntities = collides;
getHandle().k = collides; // First boolean of Entity
}

8
CraftBukkit-Patches/0055-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From d11077745ee7745fd26ebd7d5b2d84d3ffe9a96d Mon Sep 17 00:00:00 2001
From f06c7b5594844d4b1f9153d6940d049fc8e4504d 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
@ -144,7 +144,7 @@ index a1c5869..c91a695 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 9f8750b..30a8ddc 100644
index 62ee5d5..f56cda1 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -403,7 +403,7 @@ public abstract class PlayerList {
@ -176,10 +176,10 @@ index d07b3b8..2801b5c 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 a5b7b75..28b4647 100644
index 7935f4f..3f79e7f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1320,6 +1320,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1327,6 +1327,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
@Override

8
CraftBukkit-Patches/0060-Particle-API.patch
View File

@ -1,4 +1,4 @@
From 02d65ac1109247f296b2e3d6dd33070c343fedc2 Mon Sep 17 00:00:00 2001
From 8bbfc7f6ef54134206e0b31b3192ea69169ea41e 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 ef1ff3f..5d12a5c 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 28b4647..26c932a 100644
index 3f79e7f..295565e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -322,9 +322,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -323,9 +323,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void playEffect(Location loc, Effect effect, int data) {
if (getHandle().playerConnection == null) return;
@ -146,7 +146,7 @@ index 28b4647..26c932a 100644
}
@Override
@@ -1346,6 +1344,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1353,6 +1351,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
}
}

6
CraftBukkit-Patches/0065-Disable-Connected-Check-on-setScoreboard.patch
View File

@ -1,14 +1,14 @@
From f5f64db9caf06e7acd5697cb5e01bc533cda1ac2 Mon Sep 17 00:00:00 2001
From d794f5fb8f68abdd0eb37a7a48501cce85bc0e6f 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 26c932a..03d61c5 100644
index 295565e..1a38905 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1241,7 +1241,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1242,7 +1242,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {

8
CraftBukkit-Patches/0077-Implement-Locale-Getter-for-Players.patch
View File

@ -1,11 +1,11 @@
From 0cc910792483a90b29cb4b8359d5b4e92c7819cc Mon Sep 17 00:00:00 2001
From e844cd4434f68fe2e188a4ad4b2c198a239310e6 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 9f1c122..26b4f97 100644
index ffdf25c..3438d3a 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 9f1c122..26b4f97 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 03d61c5..b7d5f28 100644
index 1a38905..1d71a65 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1401,6 +1401,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1408,6 +1408,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket( packet );
}
}

6
CraftBukkit-Patches/0082-Add-support-for-fetching-hidden-players.patch
View File

@ -1,14 +1,14 @@
From b4c4146c8beb2026e888d7da839d0b9df083b627 Mon Sep 17 00:00:00 2001
From a8849c0013aec5ed917c411dd61403f07c168077 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 b7d5f28..19008c4 100644
index 1d71a65..7343d88 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1407,6 +1407,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1414,6 +1414,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
return getHandle().locale;
}

6
CraftBukkit-Patches/0084-Cap-Channel-Registrations.patch
View File

@ -1,14 +1,14 @@
From 66bc41490b7841ea522b2efabbc98c37ab31fa86 Mon Sep 17 00:00:00 2001
From b10a72c0cf0d1e2ce8a59cf6f667d5afbba7d758 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 19008c4..912ac14 100644
index 7343d88..7fa969e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1061,6 +1061,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1062,6 +1062,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void addChannel(String channel) {

6
CraftBukkit-Patches/0110-Convert-player-skulls-async.patch
View File

@ -1,4 +1,4 @@
From 524df75c18f1dba8751a524c38b90704debf2661 Mon Sep 17 00:00:00 2001
From f42c729127f72c572f9e6c963d98f1e52eeb66a6 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sun, 20 Apr 2014 13:18:55 +0100
Subject: [PATCH] Convert player skulls async
@ -195,10 +195,10 @@ index 0048b65..58014c5 100644
public int getSkullType() {
return this.a;
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
index 89912bc..848a6f9 100644
index ead8a98..ce5425f 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
@@ -45,13 +45,27 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
@@ -68,13 +68,27 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
}
@Override

8
CraftBukkit-Patches/0132-Prevent-a-crash-involving-attributes.patch
View File

@ -1,14 +1,14 @@
From 7ba036ae3caf4ace3b69fbce3b09a1a9a0914e35 Mon Sep 17 00:00:00 2001
From 6bf2c472a19e3c1dc084c2cbaafd1175ab013ee2 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 912ac14..50761d7 100644
index 7fa969e..653badd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1311,7 +1311,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1312,7 +1312,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
break;
}
}
@ -24,7 +24,7 @@ index 912ac14..50761d7 100644
+ // Spigot end
}
// Spigot start
@Override
--
2.1.4

8
CraftBukkit-Patches/0142-Remove-uneeded-validation.patch
View File

@ -1,11 +1,11 @@
From 4d8c56ece612c40c92703ebd4a00ca84ed3859e4 Mon Sep 17 00:00:00 2001
From 3b912fcf47b7e4ced2ee16895b4541171622d74e Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu>
Date: Fri, 15 Aug 2014 18:11:09 -0400
Subject: [PATCH] Remove uneeded validation
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 736aa69..9a8820b 100644
index 3940b5e..7b0e9a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -239,7 +239,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@ -17,7 +17,7 @@ index 736aa69..9a8820b 100644
this.enchantments = new HashMap<Enchantment, Integer>(meta.enchantments);
}
@@ -573,7 +573,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -572,7 +572,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
}
static void applyEnchantments(Map<Enchantment, Integer> enchantments, NBTTagCompound tag, ItemMetaKey key) {
@ -26,7 +26,7 @@ index 736aa69..9a8820b 100644
return;
}
@@ -660,7 +660,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -659,7 +659,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
}
public boolean removeEnchant(Enchantment ench) {

18
CraftBukkit-Patches/0147-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
View File

@ -1,11 +1,11 @@
From 4a59f59f867cb21da9e1a5da6f3e06e70c726e15 Mon Sep 17 00:00:00 2001
From fcff84cefce17a4b1ce7d468a6e5a868e972e5c0 Mon Sep 17 00:00:00 2001
From: libraryaddict <redwarfare@live.com>
Date: Fri, 22 Aug 2014 05:35:16 -0400
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index e57431f..75f81ed 100644
index 88b197d..bc35387 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -217,6 +217,8 @@ class CraftMetaItem implements ItemMeta, Repairable {
@ -53,7 +53,7 @@ index e57431f..75f81ed 100644
String internal = SerializableMeta.getString(map, "internal", true);
if (internal != null) {
ByteArrayInputStream buf = new ByteArrayInputStream(Base64.decodeBase64(internal));
@@ -553,6 +570,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -552,6 +569,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
}
applyEnchantments(enchantments, itemTag, ENCHANTMENTS);
@ -68,7 +68,7 @@ index e57431f..75f81ed 100644
if (hasRepairCost()) {
itemTag.setInt(REPAIR.NBT, repairCost);
@@ -612,7 +637,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -611,7 +636,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@Overridden
boolean isEmpty() {
@ -77,7 +77,7 @@ index e57431f..75f81ed 100644
}
public String getDisplayName() {
@@ -770,7 +795,8 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -769,7 +794,8 @@ class CraftMetaItem implements ItemMeta, Repairable {
&& (this.hasLore() ? that.hasLore() && this.lore.equals(that.lore) : !that.hasLore())
&& (this.hasRepairCost() ? that.hasRepairCost() && this.repairCost == that.repairCost : !that.hasRepairCost())
&& (this.unhandledTags.equals(that.unhandledTags))
@ -87,7 +87,7 @@ index e57431f..75f81ed 100644
}
/**
@@ -797,6 +823,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -796,6 +822,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
hash = 61 * hash + (hasRepairCost() ? this.repairCost : 0);
hash = 61 * hash + unhandledTags.hashCode();
hash = 61 * hash + hideFlag;
@ -95,7 +95,7 @@ index e57431f..75f81ed 100644
return hash;
}
@@ -840,6 +867,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -839,6 +866,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
if (hasRepairCost()) {
builder.put(REPAIR.BUKKIT, repairCost);
}
@ -110,7 +110,7 @@ index e57431f..75f81ed 100644
Set<String> hideFlags = new HashSet<String>();
for (ItemFlag hideFlagEnum : getItemFlags()) {
@@ -932,6 +967,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -930,6 +965,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
synchronized (HANDLED_TAGS) {
if (HANDLED_TAGS.isEmpty()) {
HANDLED_TAGS.addAll(Arrays.asList(
@ -118,7 +118,7 @@ index e57431f..75f81ed 100644
DISPLAY.NBT,
REPAIR.NBT,
ENCHANTMENTS.NBT,
@@ -957,6 +993,19 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -956,6 +992,19 @@ class CraftMetaItem implements ItemMeta, Repairable {
// Spigot start
private final Spigot spigot = new Spigot()
{

8
CraftBukkit-Patches/0150-BungeeCord-Chat-API.patch
View File

@ -1,4 +1,4 @@
From 4b43d0abade838e24e8635f55681e4df2a70f59a Mon Sep 17 00:00:00 2001
From 681c1beddeedb2f4123aa10b9a6e607014f2a75d 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
@ -89,10 +89,10 @@ index 050c188..fd41124 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 50761d7..40ee4d3 100644
index 653badd..3162541 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;
@@ -19,6 +19,7 @@ import java.util.Set;
import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -100,7 +100,7 @@ index 50761d7..40ee4d3 100644
import net.minecraft.server.*;
@@ -1428,6 +1429,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1435,6 +1436,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}