From 53e65c99d236cba48e641458aca98993fd11d7bd Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 27 Mar 2016 10:11:19 +1100 Subject: [PATCH] Patch rebuild --- ...4-Add-Getter-for-Entity-Invulnerability.patch | 10 +++++----- .../0002-Skeleton-API-Implementations.patch | 10 +++++----- CraftBukkit-Patches/0010-Spigot-Timings.patch | 16 ++++++++-------- .../0035-Player-Collision-API.patch | 14 +++++++------- ...7-Add-Getter-for-Entity-Invulnerability.patch | 6 +++--- .../0042-Implement-respawn-API.patch | 6 +++--- .../0048-BungeeCord-Support.patch | 8 ++++---- CraftBukkit-Patches/0053-Particle-API.patch | 6 +++--- ...068-Implement-Locale-Getter-for-Players.patch | 8 ++++---- .../0069-Cap-Entity-Collisions.patch | 10 +++++----- ...Add-support-for-fetching-hidden-players.patch | 6 +++--- ...21-Prevent-a-crash-involving-attributes.patch | 6 +++--- .../0139-BungeeCord-Chat-API.patch | 6 +++--- 13 files changed, 56 insertions(+), 56 deletions(-) diff --git a/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch b/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch index cb086656..42a13e48 100644 --- a/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch +++ b/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch @@ -1,17 +1,17 @@ -From d60f114d2e756c1757df92f70c3bf32a631f5a6d Mon Sep 17 00:00:00 2001 +From c3f2101a257847fb338bd5bb7166e2c5ba2378d6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:49:36 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 6dc7076..9f4d48b 100644 +index bba33b9..e5fc22a 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -356,4 +356,22 @@ public interface Entity extends Metadatable, CommandSender { - * @return whether the entity is glowing +@@ -373,4 +373,22 @@ public interface Entity extends Metadatable, CommandSender { + * @return whether the entity is */ - boolean isGlowing(); + public boolean isInvulnerable(); + + // Spigot Start + public class Spigot diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch index 80d09d43..79c017d2 100644 --- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From dbab11711c1dc9c2c50e9bdae2bf3f1b948ea006 Mon Sep 17 00:00:00 2001 +From ccd010c5174ed6ddfcff7e5d5b99969c11535f0b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -64,10 +64,10 @@ index dca8520..bf48e6e 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 5572ac1..73161c1 100644 +index 83f9131..fe3ff16 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -570,4 +570,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -580,4 +580,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } return perm; } @@ -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 303da2d..01ba89f 100644 +index cf307e5..e8728aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1402,4 +1402,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1401,4 +1401,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().playerConnection.sendPacket(packetplayoutworldparticles); } diff --git a/CraftBukkit-Patches/0010-Spigot-Timings.patch b/CraftBukkit-Patches/0010-Spigot-Timings.patch index d4548f86..8a4144ae 100644 --- a/CraftBukkit-Patches/0010-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0010-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 04820c28b83f53da5909525a5535c9f88b5728b4 Mon Sep 17 00:00:00 2001 +From 0f392c9d702053ebc22219c041ed4ab34d5bbe93 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -160,7 +160,7 @@ index ef59000..0d432df 100644 public void recalcPosition() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 2e8b57b..c9651a9 100644 +index 92c7ae9..7234cf8 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -24,6 +24,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent; @@ -172,7 +172,7 @@ index 2e8b57b..c9651a9 100644 public abstract class EntityLiving extends Entity { private static final UUID a = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D"); -@@ -1680,6 +1682,7 @@ public abstract class EntityLiving extends Entity { +@@ -1681,6 +1683,7 @@ public abstract class EntityLiving extends Entity { } public void m() { @@ -180,7 +180,7 @@ index 2e8b57b..c9651a9 100644 super.m(); this.cu(); if (!this.world.isClientSide) { -@@ -1752,7 +1755,9 @@ public abstract class EntityLiving extends Entity { +@@ -1753,7 +1756,9 @@ public abstract class EntityLiving extends Entity { } } @@ -190,7 +190,7 @@ index 2e8b57b..c9651a9 100644 double d0 = this.locX - this.lastX; double d1 = this.locZ - this.lastZ; float f = (float) (d0 * d0 + d1 * d1); -@@ -1822,6 +1827,7 @@ public abstract class EntityLiving extends Entity { +@@ -1823,6 +1828,7 @@ public abstract class EntityLiving extends Entity { this.bo = 0; } @@ -198,7 +198,7 @@ index 2e8b57b..c9651a9 100644 } protected float h(float f, float f1) { -@@ -1886,6 +1892,7 @@ public abstract class EntityLiving extends Entity { +@@ -1887,6 +1893,7 @@ public abstract class EntityLiving extends Entity { } this.world.methodProfiler.a("ai"); @@ -206,7 +206,7 @@ index 2e8b57b..c9651a9 100644 if (this.cf()) { this.bc = false; this.bd = 0.0F; -@@ -1896,6 +1903,7 @@ public abstract class EntityLiving extends Entity { +@@ -1897,6 +1904,7 @@ public abstract class EntityLiving extends Entity { this.doTick(); this.world.methodProfiler.b(); } @@ -214,7 +214,7 @@ index 2e8b57b..c9651a9 100644 this.world.methodProfiler.b(); this.world.methodProfiler.a("jump"); -@@ -1918,10 +1926,14 @@ public abstract class EntityLiving extends Entity { +@@ -1919,10 +1927,14 @@ public abstract class EntityLiving extends Entity { this.be *= 0.98F; this.bf *= 0.9F; this.r(); diff --git a/CraftBukkit-Patches/0035-Player-Collision-API.patch b/CraftBukkit-Patches/0035-Player-Collision-API.patch index 942ad809..38af8618 100644 --- a/CraftBukkit-Patches/0035-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0035-Player-Collision-API.patch @@ -1,11 +1,11 @@ -From 5cb4c77361fa3df82d795a16680348b0b7a0b10d Mon Sep 17 00:00:00 2001 +From a97093cce7fdba9c3c264d266d75e947fab47870 Mon Sep 17 00:00:00 2001 From: md_5 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 74bf367..45c4ef3 100644 +index 588b782..6c6d45d 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -377,6 +377,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -25,10 +25,10 @@ index 74bf367..45c4ef3 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6fabefa..0cf1b90 100644 +index d0e2465..464788e 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1974,7 +1974,7 @@ public abstract class EntityLiving extends Entity { +@@ -1975,7 +1975,7 @@ public abstract class EntityLiving extends Entity { protected void cn() { List list = this.world.a((Entity) this, this.getBoundingBox(), IEntitySelector.a(this)); @@ -38,7 +38,7 @@ index 6fabefa..0cf1b90 100644 Entity entity = (Entity) list.get(i); // TODO better check now? diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 4e34d45..688b359 100644 +index 2ac8274..108f7d3 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -65,6 +65,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -64,10 +64,10 @@ index 4e34d45..688b359 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 e93cedb..cdabd78 100644 +index 63ba9e0..bfe8ae0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1407,6 +1407,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1406,6 +1406,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Spigot start private final Player.Spigot spigot = new Player.Spigot() { diff --git a/CraftBukkit-Patches/0037-Add-Getter-for-Entity-Invulnerability.patch b/CraftBukkit-Patches/0037-Add-Getter-for-Entity-Invulnerability.patch index fab34e05..21eb0601 100644 --- a/CraftBukkit-Patches/0037-Add-Getter-for-Entity-Invulnerability.patch +++ b/CraftBukkit-Patches/0037-Add-Getter-for-Entity-Invulnerability.patch @@ -1,14 +1,14 @@ -From 326569f965aed34fa126fadba0f79c8b14ae6604 Mon Sep 17 00:00:00 2001 +From 1378eaa1967055f6f516d921de03f71c121128a0 Mon Sep 17 00:00:00 2001 From: DerFlash Date: Sat, 3 Aug 2013 19:53:48 +1000 Subject: [PATCH] Add Getter for Entity Invulnerability diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 73161c1..18377b0 100644 +index fe3ff16..f1a0f3d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -574,6 +574,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -584,6 +584,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { // Spigot start private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0042-Implement-respawn-API.patch b/CraftBukkit-Patches/0042-Implement-respawn-API.patch index 2a34927e..bfe802f8 100644 --- a/CraftBukkit-Patches/0042-Implement-respawn-API.patch +++ b/CraftBukkit-Patches/0042-Implement-respawn-API.patch @@ -1,14 +1,14 @@ -From ece598b449d1a8fe3073de1e90068246dd1cbf75 Mon Sep 17 00:00:00 2001 +From 01c11a00d25bc22752e6c196ce45c05cd49be09e Mon Sep 17 00:00:00 2001 From: ninja- 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 f7e6c07..d245755 100644 +index cabad9a..fd7fe0a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1420,6 +1420,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1419,6 +1419,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().collidesWithEntities = collides; getHandle().i = collides; // First boolean of Entity } diff --git a/CraftBukkit-Patches/0048-BungeeCord-Support.patch b/CraftBukkit-Patches/0048-BungeeCord-Support.patch index 88712116..e4c74d75 100644 --- a/CraftBukkit-Patches/0048-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0048-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From abc10e573e1f4f0c7d755ef8d96a1e4aa1381c17 Mon Sep 17 00:00:00 2001 +From ed2e315258fcd417179fb9c5d204f6fc404408c4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -117,7 +117,7 @@ index 86f1be7..e6ab607 100644 this.d = EnumProtocol.a(packetdataserializer.g()); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index f878dfc..eb9375d 100644 +index eea4ae1..200ed13 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -451,7 +451,7 @@ public abstract class PlayerList { @@ -149,10 +149,10 @@ index 72e1e2f..1a5f14d 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 d245755..71d4ddc 100644 +index fd7fe0a..3de831a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1409,6 +1409,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1408,6 +1408,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { { @Override diff --git a/CraftBukkit-Patches/0053-Particle-API.patch b/CraftBukkit-Patches/0053-Particle-API.patch index 913b8c35..679f3b30 100644 --- a/CraftBukkit-Patches/0053-Particle-API.patch +++ b/CraftBukkit-Patches/0053-Particle-API.patch @@ -1,4 +1,4 @@ -From 6f20078809e8e534751ab3cdb12ef2913ea14438 Mon Sep 17 00:00:00 2001 +From c330a77fa5e4b327f5c1947fb19463e4b48e51d0 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -132,7 +132,7 @@ index ad224bf..c8568c0 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 a90de6a..9ef1fc4 100644 +index 3de831a..69a5fce 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -315,9 +315,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -146,7 +146,7 @@ index a90de6a..9ef1fc4 100644 } @Override -@@ -1435,6 +1433,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1434,6 +1432,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player { server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false ); } } diff --git a/CraftBukkit-Patches/0068-Implement-Locale-Getter-for-Players.patch b/CraftBukkit-Patches/0068-Implement-Locale-Getter-for-Players.patch index 66ebb0ed..23da736d 100644 --- a/CraftBukkit-Patches/0068-Implement-Locale-Getter-for-Players.patch +++ b/CraftBukkit-Patches/0068-Implement-Locale-Getter-for-Players.patch @@ -1,11 +1,11 @@ -From 91de49dc685e28082f2060813a712900d00ef634 Mon Sep 17 00:00:00 2001 +From 970a12e19b3fbe299d02b04d8d712b2d1a44debc Mon Sep 17 00:00:00 2001 From: Smove 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 91b5e2e..7df4d87 100644 +index 108f7d3..8f57b21 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -25,7 +25,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -18,10 +18,10 @@ index 91b5e2e..7df4d87 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 28fc6e6..8307458 100644 +index 25687e3..c6d9b4b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1490,6 +1490,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1489,6 +1489,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().playerConnection.sendPacket( packet ); } } diff --git a/CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch index b365c9e5..55ba1cd4 100644 --- a/CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 65b40359420e0895ba245c0a7645e1fccdef63e0 Mon Sep 17 00:00:00 2001 +From 7418a7d9226888d4c0098a35ad309c39f54484ff Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 31 Jan 2014 11:18:34 -0500 Subject: [PATCH] Cap Entity Collisions @@ -7,7 +7,7 @@ Limit a single entity to colliding a max of configurable times per tick. This will alleviate issues where living entities are hoarded in 1x1 pens. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b723b9b..0b0ff64 100644 +index 97821bf..5fe7b07 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -147,6 +147,7 @@ public abstract class Entity implements ICommandListener { @@ -19,10 +19,10 @@ index b723b9b..0b0ff64 100644 public Entity(World world) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 0cf1b90..8122cae 100644 +index 464788e..5755e44 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1975,7 +1975,8 @@ public abstract class EntityLiving extends Entity { +@@ -1976,7 +1976,8 @@ public abstract class EntityLiving extends Entity { List list = this.world.a((Entity) this, this.getBoundingBox(), IEntitySelector.a(this)); if (this.isInteractable() && !list.isEmpty()) { // Spigot: Add isInteractable() condition @@ -32,7 +32,7 @@ index 0cf1b90..8122cae 100644 Entity entity = (Entity) list.get(i); // TODO better check now? // CraftBukkit start - Only handle mob (non-player) collisions every other tick -@@ -1984,7 +1985,8 @@ public abstract class EntityLiving extends Entity { +@@ -1985,7 +1986,8 @@ public abstract class EntityLiving extends Entity { } // CraftBukkit end diff --git a/CraftBukkit-Patches/0073-Add-support-for-fetching-hidden-players.patch b/CraftBukkit-Patches/0073-Add-support-for-fetching-hidden-players.patch index 5532b4de..f1685074 100644 --- a/CraftBukkit-Patches/0073-Add-support-for-fetching-hidden-players.patch +++ b/CraftBukkit-Patches/0073-Add-support-for-fetching-hidden-players.patch @@ -1,14 +1,14 @@ -From 42830031dfc5b195e41d63fc7a07b36a0805af2a Mon Sep 17 00:00:00 2001 +From 23555340c4aa7b91f8f776fc8a7150de116eda1a Mon Sep 17 00:00:00 2001 From: Tux 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 8307458..a725cf6 100644 +index c6d9b4b..694c8b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1496,6 +1496,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1495,6 +1495,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { { return getHandle().locale; } diff --git a/CraftBukkit-Patches/0121-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0121-Prevent-a-crash-involving-attributes.patch index 63a85e14..57d6bca4 100644 --- a/CraftBukkit-Patches/0121-Prevent-a-crash-involving-attributes.patch +++ b/CraftBukkit-Patches/0121-Prevent-a-crash-involving-attributes.patch @@ -1,14 +1,14 @@ -From f96164c1f3d6856df8008b2be6afc7ac1ce03a17 Mon Sep 17 00:00:00 2001 +From e83d8b87b42f3a54060f2663e82ca203603e5058 Mon Sep 17 00:00:00 2001 From: Thinkofdeath 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 92e14d4..8fefb1f 100644 +index 8b955ca..3c4c0a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1304,7 +1304,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1303,7 +1303,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { break; } } diff --git a/CraftBukkit-Patches/0139-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0139-BungeeCord-Chat-API.patch index e698fe9c..5c87a24a 100644 --- a/CraftBukkit-Patches/0139-BungeeCord-Chat-API.patch +++ b/CraftBukkit-Patches/0139-BungeeCord-Chat-API.patch @@ -1,4 +1,4 @@ -From 24e6c6941fbbb67401365dea9f85460add367e33 Mon Sep 17 00:00:00 2001 +From 6b4ff8a1e937bab924f421405dce52acd685903b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 13:06:05 +1100 Subject: [PATCH] BungeeCord Chat API @@ -65,7 +65,7 @@ index cabb3e5..7831a12 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 8fefb1f..250f112 100644 +index 3c4c0a4..c137882 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -19,6 +19,7 @@ import java.util.Set; @@ -76,7 +76,7 @@ index 8fefb1f..250f112 100644 import net.minecraft.server.*; import net.minecraft.server.PacketPlayOutTitle.EnumTitleAction; -@@ -1517,6 +1518,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1516,6 +1517,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return java.util.Collections.unmodifiableSet( ret ); }