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

Rebuild patches

Browse source
This commit is contained in:
md_5 2016-12-18 09:34:30 +11:00
parent f950f8e3b8
commit ee7e6924bb
54 changed files with 231 additions and 231 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Bukkit-Patches/0004-BungeeCord-Support.patch
View file

@ -1,14 +1,14 @@
From 48dbd79f62d0ab4a907b76bfe897457507912b4c Mon Sep 17 00:00:00 2001
From bc5c6e5cc255ed8f34a75496e0e71c0885de0974 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 4fa46f0..5e5995b 100644
index cd36fbb..93dac6d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1331,4 +1331,22 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1346,4 +1346,22 @@ 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);

10
Bukkit-Patches/0006-Add-Particle-API.patch
View file

@ -1,4 +1,4 @@
From 60c53ed950566ac19fd592fb8ec02aa3f39b10f9 Mon Sep 17 00:00:00 2001
From f07879c78159c1ac3240d97c8fc1db08ab5fd863 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
@ -344,10 +344,10 @@ index ba7dc49..a803228 100644
+ public enum Type {SOUND, VISUAL, PARTICLE}
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 8dd254a..85819b9 100644
index f34b3a9..2504810 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1222,6 +1222,60 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1258,6 +1258,60 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean isGameRule(String rule);
@ -409,10 +409,10 @@ index 8dd254a..85819b9 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 5e5995b..738f3bb 100644
index 93dac6d..4efcb28 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1345,6 +1345,12 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1360,6 +1360,12 @@ 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 eba5cca7ec4102369b221c05089a94f44822677d Mon Sep 17 00:00:00 2001
From 609076df796bb598dc461fb769caab8c5afe4505 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 738f3bb..b9e4d68 100644
index 4efcb28..c609800 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1351,6 +1351,31 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1366,6 +1366,31 @@ 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 83219416ba90b7c9b966c3b5a01c9527638a9c75 Mon Sep 17 00:00:00 2001
From 7cc8730d91ca641887cf43c6fbb1e1e608e289aa 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 b9e4d68..b1ca672 100644
index c609800..7b7d529 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1376,6 +1376,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1391,6 +1391,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 53f18111d11a049b6c5e67d5bd782690ecd3b47b Mon Sep 17 00:00:00 2001
From 285f73d9092616c1cb6050f283f522dec125bfd6 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 b1ca672..9fc9d70 100644
index 7b7d529..f887b7c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1384,6 +1384,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1399,6 +1399,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 8fe2d6f927a4824ffc16407888cd845e65052513 Mon Sep 17 00:00:00 2001
From 7901f1f673dbba369a423d11b1433a9d0c7aede5 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 9fc9d70..680ba2c 100644
index f887b7c..a1723dd 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1394,6 +1394,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1409,6 +1409,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0020-Silenceable-Lightning-API.patch
View file

@ -1,14 +1,14 @@
From 5c79ee492c9dc58daa07858fdd13a4aca21e6ade Mon Sep 17 00:00:00 2001
From 6ab3b5431a0d834489456cf7d6d97c89ed9a2f32 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 85819b9..035bcbb 100644
index 2504810..e9b1b0a 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1271,6 +1271,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1307,6 +1307,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0028-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From deb4bd8e0ec7a4655afceb5709c496a73ab69a6e Mon Sep 17 00:00:00 2001
From c4d64c1638325518a0031f7998e8cc34746a61ed Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 02:59:14 +0100
Subject: [PATCH] BungeeCord Chat API
@ -297,10 +297,10 @@ index bcc4090..2690aad 100644
Spigot spigot();
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f60fc1c..36094b5 100644
index a0e6e30..6299843 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1402,6 +1402,44 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1417,6 +1417,44 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

14
CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 279abc7d82a4408872097d578005a58dba8ba159 Mon Sep 17 00:00:00 2001
From 9237a446a4546ceab86ce3748b934cd6ec8f33e8 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
@ -25,10 +25,10 @@ index a838dfe..e91ba67 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 3cbf09e..535f349 100644
index de65b34..1784418 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1521,4 +1521,14 @@ public class CraftWorld implements World {
@@ -1545,4 +1545,14 @@ public class CraftWorld implements World {
cps.unload(chunk);
}
}
@ -104,10 +104,10 @@ index 64e346d..194d830 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 ab638ba..3988efa 100644
index 9f0b065..56e9a46 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1443,4 +1443,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1453,4 +1453,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket(packetplayoutworldparticles);
}
@ -124,10 +124,10 @@ index ab638ba..3988efa 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 a169e10..d3d3bb7 100644
index bb76444..fd74622 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -854,4 +854,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -856,4 +856,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
return HANDLED_TAGS;
}
}

6
CraftBukkit-Patches/0007-Merge-tweaks-and-configuration.patch
View file

@ -1,4 +1,4 @@
From c6d18df7931862fddcd2adb38fc7ca6e6a00c714 Mon Sep 17 00:00:00 2001
From afabb03519d8b50468a910fbc3804e1236d0768e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration
@ -43,10 +43,10 @@ index c6ae222..4ee2782 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 66d42a2..75e7638 100644
index 157c093..09dfd2e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -999,6 +999,23 @@ public abstract class World implements IBlockAccess {
@@ -1000,6 +1000,23 @@ public abstract class World implements IBlockAccess {
// Not all projectiles extend EntityProjectile, so check for Bukkit interface instead
event = CraftEventFactory.callProjectileLaunchEvent(entity);
}

20
CraftBukkit-Patches/0008-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From 48880752d669927f86ca08390886003ad2324c0c Mon Sep 17 00:00:00 2001
From 28959bea9edcffe34af70a86cc9d37c970680e08 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 6987482..9d14403 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 bf4dc36..92b93ba 100644
index 178bc15..a630e5e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -656,6 +656,7 @@ public abstract class EntityLiving extends Entity {
@ -78,7 +78,7 @@ index 9c8118d..b688e99 100644
this.trackedPlayers.remove(entityplayer);
this.tracker.c(entityplayer);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 75e7638..91eb378 100644
index 09dfd2e..8f30e07 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -969,6 +969,7 @@ public abstract class World implements IBlockAccess {
@ -89,7 +89,7 @@ index 75e7638..91eb378 100644
if (entity == null) return false;
// CraftBukkit end
int i = MathHelper.floor(entity.locX / 16.0D);
@@ -1076,6 +1077,7 @@ public abstract class World implements IBlockAccess {
@@ -1077,6 +1078,7 @@ public abstract class World implements IBlockAccess {
}
public void removeEntity(Entity entity) {
@ -97,7 +97,7 @@ index 75e7638..91eb378 100644
entity.b(false);
entity.die();
if (entity instanceof EntityHuman) {
@@ -2465,6 +2467,7 @@ public abstract class World implements IBlockAccess {
@@ -2466,6 +2468,7 @@ public abstract class World implements IBlockAccess {
}
public void a(Collection<Entity> collection) {
@ -106,10 +106,10 @@ index 75e7638..91eb378 100644
// this.entityList.addAll(collection);
Iterator iterator = collection.iterator();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 26d7994..c27c325 100644
index 1784418..5c59f0d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -170,6 +170,7 @@ public class CraftWorld implements World {
@@ -172,6 +172,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunkRequest(int x, int z, boolean safe) {
@ -117,7 +117,7 @@ index 26d7994..c27c325 100644
if (safe && isChunkInUse(x, z)) {
return false;
}
@@ -183,6 +184,7 @@ public class CraftWorld implements World {
@@ -185,6 +186,7 @@ public class CraftWorld implements World {
}
public boolean unloadChunk(int x, int z, boolean save, boolean safe) {
@ -125,7 +125,7 @@ index 26d7994..c27c325 100644
if (isChunkInUse(x, z)) {
return false;
}
@@ -253,6 +255,7 @@ public class CraftWorld implements World {
@@ -255,6 +257,7 @@ public class CraftWorld implements World {
}
public boolean loadChunk(int x, int z, boolean generate) {
@ -134,7 +134,7 @@ index 26d7994..c27c325 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 fc64195..101ee66 100644
index 56e9a46..6d95870 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -211,6 +211,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

46
CraftBukkit-Patches/0010-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From f48f62451d11e139f467c1f9e41a6d2068547de6 Mon Sep 17 00:00:00 2001
From c8b08ad47cab667770ed291216b2dcc3a505e620 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -160,7 +160,7 @@ index 27f9bcd..e6514d2 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 e41017e..e732a4a 100644
index a630e5e..450f390 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -31,6 +31,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -172,7 +172,7 @@ index e41017e..e732a4a 100644
public abstract class EntityLiving extends Entity {
private static final Logger a = LogManager.getLogger();
@@ -1803,6 +1805,7 @@ public abstract class EntityLiving extends Entity {
@@ -1806,6 +1808,7 @@ public abstract class EntityLiving extends Entity {
}
public void A_() {
@ -180,7 +180,7 @@ index e41017e..e732a4a 100644
super.A_();
this.cA();
if (!this.world.isClientSide) {
@@ -1875,7 +1878,9 @@ public abstract class EntityLiving extends Entity {
@@ -1878,7 +1881,9 @@ public abstract class EntityLiving extends Entity {
}
}
@ -190,7 +190,7 @@ index e41017e..e732a4a 100644
double d0 = this.locX - this.lastX;
double d1 = this.locZ - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -1945,6 +1950,7 @@ public abstract class EntityLiving extends Entity {
@@ -1948,6 +1953,7 @@ public abstract class EntityLiving extends Entity {
this.bp = 0;
}
@ -198,7 +198,7 @@ index e41017e..e732a4a 100644
}
protected float h(float f, float f1) {
@@ -2009,6 +2015,7 @@ public abstract class EntityLiving extends Entity {
@@ -2012,6 +2018,7 @@ public abstract class EntityLiving extends Entity {
}
this.world.methodProfiler.a("ai");
@ -206,7 +206,7 @@ index e41017e..e732a4a 100644
if (this.isFrozen()) {
this.bd = false;
this.be = 0.0F;
@@ -2019,6 +2026,7 @@ public abstract class EntityLiving extends Entity {
@@ -2022,6 +2029,7 @@ public abstract class EntityLiving extends Entity {
this.doTick();
this.world.methodProfiler.b();
}
@ -214,7 +214,7 @@ index e41017e..e732a4a 100644
this.world.methodProfiler.b();
this.world.methodProfiler.a("jump");
@@ -2041,10 +2049,14 @@ public abstract class EntityLiving extends Entity {
@@ -2044,10 +2052,14 @@ public abstract class EntityLiving extends Entity {
this.bf *= 0.98F;
this.bg *= 0.9F;
this.r();
@ -355,10 +355,10 @@ index 7da4b02..2476207 100644
this.methodProfiler.b();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a5b0788..967282d 100644
index 16c3555..9cd95fc 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1260,6 +1260,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1262,6 +1262,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
// CraftBukkit end
private void handleCommand(String s) {
@ -366,7 +366,7 @@ index a5b0788..967282d 100644
// CraftBukkit start - whole method
this.LOGGER.info(this.player.getName() + " issued server command: " + s);
@@ -1269,18 +1270,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1271,18 +1272,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@ -407,7 +407,7 @@ index 9f93b12..8781203 100644
private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 91eb378..672e65c 100644
index 8f30e07..e1d1a77 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,6 +18,7 @@ import com.google.common.collect.Maps;
@ -435,7 +435,7 @@ index 91eb378..672e65c 100644
}
public World b() {
@@ -1364,6 +1368,7 @@ public abstract class World implements IBlockAccess {
@@ -1365,6 +1369,7 @@ public abstract class World implements IBlockAccess {
CrashReportSystemDetails crashreportsystemdetails1;
CrashReport crashreport1;
@ -443,7 +443,7 @@ index 91eb378..672e65c 100644
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
entity = (Entity) this.entityList.get(this.tickPosition);
@@ -1381,7 +1386,9 @@ public abstract class World implements IBlockAccess {
@@ -1382,7 +1387,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.a("tick");
if (!entity.dead && !(entity instanceof EntityPlayer)) {
try {
@ -453,7 +453,7 @@ index 91eb378..672e65c 100644
} catch (Throwable throwable1) {
crashreport1 = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
@@ -1407,8 +1414,10 @@ public abstract class World implements IBlockAccess {
@@ -1408,8 +1415,10 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.b();
}
@ -464,7 +464,7 @@ index 91eb378..672e65c 100644
// CraftBukkit start - From below, clean up tile entities before ticking them
if (!this.tileEntityListUnload.isEmpty()) {
this.tileEntityListTick.removeAll(this.tileEntityListUnload);
@@ -1427,6 +1436,7 @@ public abstract class World implements IBlockAccess {
@@ -1428,6 +1437,7 @@ public abstract class World implements IBlockAccess {
if (this.isLoaded(blockposition) && this.N.a(blockposition)) {
try {
this.methodProfiler.a(""/*tileentity.getClass().getSimpleName()*/); // CraftBukkit: SPIGOT-1900
@ -472,7 +472,7 @@ index 91eb378..672e65c 100644
((ITickable) tileentity).F_();
this.methodProfiler.b();
} catch (Throwable throwable2) {
@@ -1435,6 +1445,11 @@ public abstract class World implements IBlockAccess {
@@ -1436,6 +1446,11 @@ public abstract class World implements IBlockAccess {
tileentity.a(crashreportsystemdetails1);
throw new ReportedException(crashreport1);
}
@ -484,7 +484,7 @@ index 91eb378..672e65c 100644
}
}
@@ -1447,6 +1462,8 @@ public abstract class World implements IBlockAccess {
@@ -1448,6 +1463,8 @@ public abstract class World implements IBlockAccess {
}
}
@ -493,7 +493,7 @@ index 91eb378..672e65c 100644
this.M = false;
/* CraftBukkit start - Moved up
if (!this.tileEntityListUnload.isEmpty()) {
@@ -1487,6 +1504,7 @@ public abstract class World implements IBlockAccess {
@@ -1488,6 +1505,7 @@ public abstract class World implements IBlockAccess {
this.b.clear();
}
@ -501,7 +501,7 @@ index 91eb378..672e65c 100644
this.methodProfiler.b();
this.methodProfiler.b();
}
@@ -1537,6 +1555,7 @@ public abstract class World implements IBlockAccess {
@@ -1538,6 +1556,7 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - Use neighbor cache instead of looking up
Chunk startingChunk = this.getChunkIfLoaded(i >> 4, j >> 4);
if (!flag || (startingChunk != null && startingChunk.areNeighborsLoaded(2)) /* this.isAreaLoaded(i - b0, 0, j - b0, i + b0, 0, j + b0) */) {
@ -509,7 +509,7 @@ index 91eb378..672e65c 100644
// CraftBukkit end
entity.M = entity.locX;
entity.N = entity.locY;
@@ -1604,6 +1623,7 @@ public abstract class World implements IBlockAccess {
@@ -1605,6 +1624,7 @@ public abstract class World implements IBlockAccess {
}
}
@ -518,7 +518,7 @@ index 91eb378..672e65c 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 20dfac7..ed5ee83 100644
index 87abceb..b49e6ad 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -224,10 +224,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@ -573,7 +573,7 @@ index 20dfac7..ed5ee83 100644
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 95c21c3..df59768 100644
index c37383f..387ec18 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1677,6 +1677,11 @@ public final class CraftServer implements Server {

6
CraftBukkit-Patches/0012-Handle-Null-Tile-Entities.patch
View file

@ -1,14 +1,14 @@
From 75956e5851fb20ada5d1ec247aa69c26805878aa Mon Sep 17 00:00:00 2001
From b332e8bc5c930250805eab2e0396d015771daefc Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Handle Null Tile Entities
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 672e65c..44d2940 100644
index e1d1a77..5a9fa7e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1429,6 +1429,13 @@ public abstract class World implements IBlockAccess {
@@ -1430,6 +1430,13 @@ public abstract class World implements IBlockAccess {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();

12
CraftBukkit-Patches/0014-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From 0663a16b72ce900df15d6c8e1217618878a00baf Mon Sep 17 00:00:00 2001
From 01cf4a1b005635450c007c07412e3d6112fe080f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range
@ -84,7 +84,7 @@ index 233a3f6..cc4406d 100644
super(world);
}
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 2b35b0f..b47bc90 100644
index f070379..9b544cd 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -39,6 +39,18 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@ -159,7 +159,7 @@ index d605892..6fc56f4 100644
// Spigot start
double radius = world.spigotConfig.itemMerge;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index e732a4a..4617473 100644
index 450f390..95b59ba 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -115,6 +115,13 @@ public abstract class EntityLiving extends Entity {
@ -177,10 +177,10 @@ index e732a4a..4617473 100644
public void Q() {
this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 44d2940..942b6ac 100644
index 5a9fa7e..849a49f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1368,6 +1368,7 @@ public abstract class World implements IBlockAccess {
@@ -1369,6 +1369,7 @@ public abstract class World implements IBlockAccess {
CrashReportSystemDetails crashreportsystemdetails1;
CrashReport crashreport1;
@ -188,7 +188,7 @@ index 44d2940..942b6ac 100644
timings.entityTick.startTiming(); // Spigot
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
@@ -1559,9 +1560,11 @@ public abstract class World implements IBlockAccess {
@@ -1560,9 +1561,11 @@ public abstract class World implements IBlockAccess {
int j = MathHelper.floor(entity.locZ);
boolean flag1 = true;

14
CraftBukkit-Patches/0016-PlayerItemDamageEvent.patch
View file

@ -1,14 +1,14 @@
From 70b887016230e864ae13734117f983d957e6d53b Mon Sep 17 00:00:00 2001
From 645a607ecab4296cce16a02c413dc586b5689837 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:45:52 +1100
Subject: [PATCH] PlayerItemDamageEvent
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index f4f7e55..88211ab 100644
index 008976a..861854b 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -349,6 +349,11 @@ public final class ItemStack {
@@ -356,6 +356,11 @@ public final class ItemStack {
}
public boolean isDamaged(int i, Random random) {
@ -20,7 +20,7 @@ index f4f7e55..88211ab 100644
if (!this.f()) {
return false;
} else {
@@ -363,6 +368,18 @@ public final class ItemStack {
@@ -370,6 +375,18 @@ public final class ItemStack {
}
i -= k;
@ -39,15 +39,15 @@ index f4f7e55..88211ab 100644
if (i <= 0) {
return false;
}
@@ -376,7 +393,7 @@ public final class ItemStack {
@@ -383,7 +400,7 @@ public final class ItemStack {
public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
if (this.f()) {
- if (this.isDamaged(i, entityliving.getRandom())) {
+ if (this.isDamaged(i, entityliving.getRandom(), entityliving)) { // Spigot
entityliving.b(this);
this.subtract(1);
if (entityliving instanceof EntityHuman) {
// CraftBukkit start - Check for item breaking
if (this.count == 1 && entityliving instanceof EntityHuman) {
--
2.9.3

8
CraftBukkit-Patches/0026-Allow-Disabling-of-Command-Logging.patch
View file

@ -1,14 +1,14 @@
From 4a84efcb74f82cd61ea05e5eed14eb6a90982bf0 Mon Sep 17 00:00:00 2001
From efa25c89c77b1804a105d555dc763ade19352c12 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index c096070..4cdbff5 100644
index 9cd95fc..e476525 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1262,6 +1262,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1264,6 +1264,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
private void handleCommand(String s) {
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
// CraftBukkit start - whole method
@ -17,7 +17,7 @@ index c096070..4cdbff5 100644
CraftPlayer player = this.getPlayer();
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index dcca493..3999f5b 100644
index 4a2048b..d2d8868 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -149,4 +149,10 @@ public class SpigotConfig

12
CraftBukkit-Patches/0028-Configurable-Messages.patch
View file

@ -1,4 +1,4 @@
From 724eb97e38e0ab5eadb11fe4748fbf4caaf48d05 Mon Sep 17 00:00:00 2001
From 8770eec41e046d27d8694333c3a3014e8541f6c4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
@ -23,10 +23,10 @@ index ec03fe5..b0642a2 100644
this.b.close(chatcomponenttext);
} else {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 04ea4cc..0de7e74 100644
index 9c1d5ff..226e7ef 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -467,7 +467,7 @@ public abstract class PlayerList {
@@ -470,7 +470,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s);
} else if (!this.isWhitelisted(gameprofile)) {
// return "You are not white-listed on this server!";
@ -35,7 +35,7 @@ index 04ea4cc..0de7e74 100644
} else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) {
IpBanEntry ipbanentry = this.l.get(socketaddress);
@@ -481,7 +481,7 @@ public abstract class PlayerList {
@@ -484,7 +484,7 @@ public abstract class PlayerList {
} else {
// return this.players.size() >= this.maxPlayers && !this.f(gameprofile) ? "The server is full!" : null;
if (this.players.size() >= this.maxPlayers && !this.f(gameprofile)) {
@ -45,7 +45,7 @@ index 04ea4cc..0de7e74 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2d9a9fc..34c46fb 100644
index 798c949..a367917 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -631,11 +631,7 @@ public final class CraftServer implements Server {
@ -62,7 +62,7 @@ index 2d9a9fc..34c46fb 100644
return false;
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index ca001e9..3726ea5 100644
index c0d33ee..05dd091 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -12,6 +12,7 @@ import java.util.Map;

6
CraftBukkit-Patches/0031-Disallow-Interaction-With-Self.patch
View file

@ -1,14 +1,14 @@
From 0d93caf9c27cc1a2812f7894211867a3e3c357d0 Mon Sep 17 00:00:00 2001
From 3589321e76b108edb7fe8a3b2b557bb80aba5cfb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4cdbff5..7d2c385 100644
index e476525..045f296 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1425,6 +1425,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1427,6 +1427,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
if (this.player.isFrozen()) return; // CraftBukkit
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);

6
CraftBukkit-Patches/0033-Prevent-Ghost-Players-Caused-by-Plugins.patch
View file

@ -1,4 +1,4 @@
From 20d822aea1102e79755c14d94b3ce9bc3ce202c7 Mon Sep 17 00:00:00 2001
From 1257d866eddd46425b478642128c781d3179fea0 Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com>
Date: Tue, 11 Jun 2013 15:23:03 -0400
Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
Check if the player is still connected after firing event. Fixes BUKKIT-4327
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 0de7e74..c0783b0 100644
index 226e7ef..0412317 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -607,6 +607,11 @@ public abstract class PlayerList {
@@ -610,6 +610,11 @@ public abstract class PlayerList {
Player respawnPlayer = cserver.getPlayer(entityplayer1);
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn);
cserver.getPluginManager().callEvent(respawnEvent);

6
CraftBukkit-Patches/0035-Player-Collision-API.patch
View file

@ -1,14 +1,14 @@
From 7fa446f49c00122aeb6be68d77cf2f146d2c063a Mon Sep 17 00:00:00 2001
From a1a090100bb60413c4f6a542c879159acd0ac0a9 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 27 Mar 2016 20:35:09 +1100
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8ced63b..23076fe 100644
index 6d95870..e694780 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1448,6 +1448,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

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

@ -1,14 +1,14 @@
From 223e3d66895f1422b518c7378f1ab977efb43c32 Mon Sep 17 00:00:00 2001
From b340744724533851dbe4d309122274fc6e4cf7f2 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 23076fe..4ca708e 100644
index e694780..4ba5ccc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1458,6 +1458,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1468,6 +1468,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setCollidesWithEntities(boolean collides) {
CraftPlayer.this.setCollidable(collides);
}

14
CraftBukkit-Patches/0046-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From 0b1eeb98cda74979f349a06cc14f706a3eb43509 Mon Sep 17 00:00:00 2001
From e276ea96c869c9d04dd59f035edc96ecf8a98a32 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
@ -117,10 +117,10 @@ index 1cb9d60..aececa3 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 c0783b0..a68363d 100644
index 0412317..795be50 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -452,7 +452,7 @@ public abstract class PlayerList {
@@ -455,7 +455,7 @@ public abstract class PlayerList {
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), gameprofile, new PlayerInteractManager(server.getWorldServer(0)));
Player player = entity.getBukkitEntity();
@ -130,7 +130,7 @@ index c0783b0..a68363d 100644
if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 588e57f..7bba94c 100644
index 5cf39ac..68a66aa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -564,7 +564,13 @@ public final class CraftServer implements Server {
@ -149,10 +149,10 @@ index 588e57f..7bba94c 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 4ca708e..c9b8cdc 100644
index 4ba5ccc..8e39734 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1450,6 +1450,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1460,6 +1460,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
@Override
@ -166,7 +166,7 @@ index 4ca708e..c9b8cdc 100644
return CraftPlayer.this.isCollidable();
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 34def7b..824ba7a 100644
index 83f3c0a..6d97556 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -211,4 +211,14 @@ public class SpigotConfig

12
CraftBukkit-Patches/0051-Particle-API.patch
View file

@ -1,4 +1,4 @@
From e79a771b05566ad2f108b34f194dad9b89980798 Mon Sep 17 00:00:00 2001
From 4e081ccb09d3265172101c30763872b8de1598da 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
@ -19,10 +19,10 @@ index 1672183..352ff3a 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d7c942f..20e3cf1 100644
index 5c59f0d..e5729d0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -827,28 +827,18 @@ public class CraftWorld implements World {
@@ -831,28 +831,18 @@ public class CraftWorld implements World {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@ -60,7 +60,7 @@ index d7c942f..20e3cf1 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1527,6 +1517,70 @@ public class CraftWorld implements World {
@@ -1551,6 +1541,70 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{
@ -132,7 +132,7 @@ index d7c942f..20e3cf1 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 c9b8cdc..99e0617 100644
index 8e39734..905ed46 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -350,9 +350,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -146,7 +146,7 @@ index c9b8cdc..99e0617 100644
}
@Override
@@ -1473,6 +1471,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1483,6 +1481,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
}
}

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

@ -1,14 +1,14 @@
From 013bc11ff1205ab1786cf73c68a8644dc555e607 Mon Sep 17 00:00:00 2001
From 8ad4f254f3713d5ea5ed63400298a31a59be154c 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 99e0617..2f3f59a 100644
index 905ed46..8d3af2f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1272,7 +1272,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1274,7 +1274,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {

6
CraftBukkit-Patches/0059-Improve-AutoSave-Mechanism.patch
View file

@ -1,4 +1,4 @@
From 56e5bb2695b303891b639402d4b11aed8ebdb96b Mon Sep 17 00:00:00 2001
From 86a38fc68f367e3efd6755f3d9e999bc7e8ef887 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 21:07:18 +1100
Subject: [PATCH] Improve AutoSave Mechanism
@ -60,10 +60,10 @@ index f8ee4b9..6121608 100644
SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f478802..0b85377 100644
index e5729d0..cc08ec6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -731,12 +731,17 @@ public class CraftWorld implements World {
@@ -735,12 +735,17 @@ public class CraftWorld implements World {
}
public void save() {

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

@ -1,11 +1,11 @@
From d3ecaeda72a96f46826e615ef0ed5eaba8ff95ba Mon Sep 17 00:00:00 2001
From 687bc9ad08edc48006e3363f1cff238aa61a09eb 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 2a1f4f7..29e33da 100644
index 7e42a38..5b88b7a 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -28,7 +28,7 @@ import org.bukkit.inventory.MainHand;
@ -18,10 +18,10 @@ index 2a1f4f7..29e33da 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 2f3f59a..02309fb 100644
index 8d3af2f..888a1c5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1528,6 +1528,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1538,6 +1538,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket( packet );
}
}

8
CraftBukkit-Patches/0067-Spam-Filter-Exclusions.patch
View file

@ -1,14 +1,14 @@
From b354c4ef85880d7464a85678c10d2808255c9c8a Mon Sep 17 00:00:00 2001
From 0f25501bb36dfb2a2382540ce41164d4c2af865d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6274d61..a06a25b 100644
index dbc3488..7c27041 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1168,9 +1168,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1170,9 +1170,20 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false);
}
@ -31,7 +31,7 @@ index 6274d61..a06a25b 100644
Waitable waitable = new Waitable() {
@Override
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 83e575f..a0a59bb 100644
index 529fdf9..b9e8613 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,7 @@ import java.io.IOException;

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

@ -1,14 +1,14 @@
From 188ad662c21f5642c2d1a395d7c60dd059182c6e Mon Sep 17 00:00:00 2001
From f4d716c57ceb6fcc0cea214cdf6acf5572c346c5 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 02309fb..35dfe8c 100644
index 888a1c5..5ac2acb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1534,6 +1534,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1544,6 +1544,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
return getHandle().locale;
}

8
CraftBukkit-Patches/0070-Allow-Disabling-Creative-Item-Filter.patch
View file

@ -1,14 +1,14 @@
From ef22c6a93951acf0ad9b6fb6a5625527c9a957c1 Mon Sep 17 00:00:00 2001
From dd20e8318c006a3c3f123eb8df429ad1a7a97e6e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 18:18:01 +1100
Subject: [PATCH] Allow Disabling Creative Item Filter
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a06a25b..c61f4fd 100644
index 7c27041..e9a0a03 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1931,7 +1931,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1933,7 +1933,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() <= 45;
// CraftBukkit - Add invalidItems check
@ -18,7 +18,7 @@ index a06a25b..c61f4fd 100644
// CraftBukkit start - Call click event
org.bukkit.entity.HumanEntity player = this.player.getBukkitEntity();
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 039777a..686b8bd 100644
index f9dce9f..38a64f6 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -296,4 +296,10 @@ public class SpigotConfig

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

@ -1,14 +1,14 @@
From 776069c4e7809d2f97d3b384e7dec99822be957d Mon Sep 17 00:00:00 2001
From 203295789e4ebc1576d3340bd2b3f1fe810f281a 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 35dfe8c..5568364 100644
index 5ac2acb..d866a25 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1092,6 +1092,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1094,6 +1094,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void addChannel(String channel) {

6
CraftBukkit-Patches/0073-Implement-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From b5c6d6043652c9664e20fd9031355641e3d3789c Mon Sep 17 00:00:00 2001
From 8396ca419e2385521253ac4d7ef4b47784c14694 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@ -40,10 +40,10 @@ index 37780ac..275582a 100644
// this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dv, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 5d5da14..e2f936c 100644
index cc08ec6..cf1a2e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1586,6 +1586,22 @@ public class CraftWorld implements World {
@@ -1610,6 +1610,22 @@ public class CraftWorld implements World {
{
CraftWorld.this.playEffect( location, effect, 0 );
}

8
CraftBukkit-Patches/0076-Guard-Entity-List.patch
View file

@ -1,11 +1,11 @@
From de5da66bd5ba1e71f865b8059f9a8c08f89be1d7 Mon Sep 17 00:00:00 2001
From 55c770834949590660516dd4cb8cde78c7c0f7df Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 10 Mar 2014 09:03:28 +1100
Subject: [PATCH] Guard Entity List
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 942b6ac..ca7f203 100644
index 849a49f..a685aad 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -33,7 +33,32 @@ public abstract class World implements IBlockAccess {
@ -50,7 +50,7 @@ index 942b6ac..ca7f203 100644
public CraftWorld getWorld() {
return this.world;
@@ -1370,6 +1396,7 @@ public abstract class World implements IBlockAccess {
@@ -1371,6 +1397,7 @@ public abstract class World implements IBlockAccess {
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
timings.entityTick.startTiming(); // Spigot
@ -58,7 +58,7 @@ index 942b6ac..ca7f203 100644
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
entity = (Entity) this.entityList.get(this.tickPosition);
@@ -1408,12 +1435,15 @@ public abstract class World implements IBlockAccess {
@@ -1409,12 +1436,15 @@ public abstract class World implements IBlockAccess {
this.getChunkAt(j, l).b(entity);
}

8
CraftBukkit-Patches/0077-Fix-ConcurrentModificationException-while-being-idle.patch
View file

@ -1,4 +1,4 @@
From 4a7ce212346ab33b92d8dabe8f71b06ce1a19b39 Mon Sep 17 00:00:00 2001
From 3656f8dcd97e18f18265ef7f7ad056081ca11e69 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 14 Jan 2014 20:11:25 +0000
Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
@ -6,7 +6,7 @@ Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ca7f203..ed8919d 100644
index a685aad..d850ea6 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1,4 +1,4 @@
@ -15,7 +15,7 @@ index ca7f203..ed8919d 100644
import com.google.common.base.Function;
import com.google.common.base.Objects;
@@ -1115,6 +1115,7 @@ public abstract class World implements IBlockAccess {
@@ -1116,6 +1116,7 @@ public abstract class World implements IBlockAccess {
this.everyoneSleeping();
}
@ -23,7 +23,7 @@ index ca7f203..ed8919d 100644
int i = entity.ab;
int j = entity.ad;
@@ -1131,6 +1132,7 @@ public abstract class World implements IBlockAccess {
@@ -1132,6 +1133,7 @@ public abstract class World implements IBlockAccess {
this.entityList.remove(index);
}
// CraftBukkit end

6
CraftBukkit-Patches/0079-Descriptive-kick-reasons-instead-of-Nope.patch
View file

@ -1,4 +1,4 @@
From 9d7f34c5869b045801ab3f94afbeadc7b5812e86 Mon Sep 17 00:00:00 2001
From f425823eaa2845779dc90575bfb3826cc86763ed Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sat, 15 Mar 2014 01:30:05 -0400
Subject: [PATCH] Descriptive kick reasons instead of Nope!
@ -27,10 +27,10 @@ index dc020bc..e148e37 100644
f1 = 0;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index c61f4fd..15eacc9 100644
index e9a0a03..5fb5a77 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1091,7 +1091,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1093,7 +1093,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
this.player.resetIdleTimer();
} else {
PlayerConnection.LOGGER.warn("{} tried to set an invalid carried item", new Object[] { this.player.getName()});

6
CraftBukkit-Patches/0090-Correct-Ban-Expiration.patch
View file

@ -1,14 +1,14 @@
From 6da84c2a0163c0ca41f5e39bdca56b66e5e3bb54 Mon Sep 17 00:00:00 2001
From 171e575982d3e070bbf9b354576bc0e6079d9d42 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 16 Apr 2014 11:14:38 +1000
Subject: [PATCH] Correct Ban Expiration
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index a68363d..a3554f5 100644
index 795be50..8a32666 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -464,7 +464,7 @@ public abstract class PlayerList {
@@ -467,7 +467,7 @@ public abstract class PlayerList {
}
// return s;

8
CraftBukkit-Patches/0099-Implement-PlayerSpawnLocationEvent.patch
View file

@ -1,14 +1,14 @@
From 0e3c6db500060466c6e68973275eabfddee5fd10 Mon Sep 17 00:00:00 2001
From 629af51b2f33e405cb61fa55cb87a18af536a6e6 Mon Sep 17 00:00:00 2001
From: ninja <xninja@openmailbox.org>
Date: Tue, 8 Apr 2014 14:05:19 +0200
Subject: [PATCH] Implement PlayerSpawnLocationEvent.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index a3554f5..bc0ba5e 100644
index 8a32666..29cd737 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -37,6 +37,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
@@ -40,6 +40,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.util.Vector;
@ -16,7 +16,7 @@ index a3554f5..bc0ba5e 100644
// CraftBukkit end
public abstract class PlayerList {
@@ -106,6 +107,19 @@ public abstract class PlayerList {
@@ -109,6 +110,19 @@ public abstract class PlayerList {
s1 = networkmanager.getSocketAddress().toString();
}

6
CraftBukkit-Patches/0101-Process-conversation-input-on-the-main-thread.-Fixes.patch
View file

@ -1,4 +1,4 @@
From 59706bb9eb8f6a644e06c71ab2f3fa7fdc7ebfaa Mon Sep 17 00:00:00 2001
From 94ee0bfcf6f8b96c87d50528105ac40149a74a03 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Wed, 14 May 2014 13:46:48 -0700
Subject: [PATCH] Process conversation input on the main thread. Fixes
@ -6,10 +6,10 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 15eacc9..316269b 100644
index 5fb5a77..b5ca3ac 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1153,7 +1153,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1155,7 +1155,18 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
} else if (s.isEmpty()) {
LOGGER.warn(this.player.getName() + " tried to send an empty message");
} else if (getPlayer().isConversing()) {

8
CraftBukkit-Patches/0106-Better-item-validation.patch
View file

@ -1,4 +1,4 @@
From a88113a70fca12d7ccc8bf3c0653bcc08348a291 Mon Sep 17 00:00:00 2001
From ff8fd2432a470d79262155698f7b7986a8f71741 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Wed, 2 Jul 2014 23:35:51 +0100
Subject: [PATCH] Better item validation
@ -58,7 +58,7 @@ index 2ed6ad7..9441364 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index d3d3bb7..4ab8c04 100644
index fd74622..bd94dfd 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -47,6 +47,10 @@ import java.util.logging.Logger;
@ -72,7 +72,7 @@ index d3d3bb7..4ab8c04 100644
/**
* Children must include the following:
*
@@ -251,7 +255,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -252,7 +256,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
NBTTagCompound display = tag.getCompound(DISPLAY.NBT);
if (display.hasKey(NAME.NBT)) {
@ -81,7 +81,7 @@ index d3d3bb7..4ab8c04 100644
}
if (display.hasKey(LORE.NBT)) {
@@ -259,7 +263,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -260,7 +264,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
lore = new ArrayList<String>(list.size());
for (int index = 0; index < list.size(); index++) {

6
CraftBukkit-Patches/0112-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
View file

@ -1,4 +1,4 @@
From 38c970a86f05b826e8acbbf42558344816b3487f Mon Sep 17 00:00:00 2001
From 6ed45f89912c33c04c24c92a28c1719b1b84d83f Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Thu, 17 Jul 2014 21:13:15 -0400
Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked
@ -6,10 +6,10 @@ Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked
diff --git a/src/main/java/net/minecraft/server/ContainerEnchantTable.java b/src/main/java/net/minecraft/server/ContainerEnchantTable.java
index 2589924..3a3fe4a 100644
index 48be7f7..d55ba00 100644
--- a/src/main/java/net/minecraft/server/ContainerEnchantTable.java
+++ b/src/main/java/net/minecraft/server/ContainerEnchantTable.java
@@ -349,7 +349,11 @@ public class ContainerEnchantTable extends Container {
@@ -367,7 +367,11 @@ public class ContainerEnchantTable extends Container {
((Slot) this.c.get(0)).set(itemstack1.cloneItemStack());
itemstack1.setCount(0);
} else if (!itemstack1.isEmpty()) {

6
CraftBukkit-Patches/0113-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
View file

@ -1,4 +1,4 @@
From beac910528bbc7c6cc1edcdb57499b9128b5f2a8 Mon Sep 17 00:00:00 2001
From ed34f3055a9ff9d045718e697f0de9944b4149d7 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 12:49:48 +0100
Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
@ -26,10 +26,10 @@ index 1c2bf8e..76dc92a 100644
EntityOcelot entityocelot = new EntityOcelot(this.world);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 4ac0996..bc214af 100644
index cf1a2e6..a15c129 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1155,6 +1155,12 @@ public class CraftWorld implements World {
@@ -1170,6 +1170,12 @@ public class CraftWorld implements World {
}
if (entity != null) {

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

@ -1,14 +1,14 @@
From 71ef383f0272110ff82c7a4a92ded949d4627d1b Mon Sep 17 00:00:00 2001
From a3e1b4096260b139f70725c3976bedc7fcd42c6c 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 5568364..689308c 100644
index d866a25..09a1569 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1345,7 +1345,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1347,7 +1347,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
break;
}
}

6
CraftBukkit-Patches/0116-Fix-Null-Tile-Entity-Worlds.patch
View file

@ -1,14 +1,14 @@
From bfaed30eff607a383864c45dcf0959a7859c1a0e Mon Sep 17 00:00:00 2001
From 29dc08527440b4cd0cfe72dd5854acdbd857c5b2 Mon Sep 17 00:00:00 2001
From: "Evan A. Haskell" <eah2119@gmail.com>
Date: Thu, 26 Jun 2014 18:37:29 -0400
Subject: [PATCH] Fix Null Tile Entity Worlds
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 23ced07..b9730a2 100644
index b4c7b11..950fc01 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1976,6 +1976,7 @@ public abstract class World implements IBlockAccess {
@@ -1977,6 +1977,7 @@ public abstract class World implements IBlockAccess {
}
}

6
CraftBukkit-Patches/0121-Filter-attribute-modifiers-which-cause-the-attribute.patch
View file

@ -1,4 +1,4 @@
From 49e48ead2e1c668301dd4ff392fb8c4ce5b2720c Mon Sep 17 00:00:00 2001
From b1079e22707619122716e6d526f81c9e072dcd20 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Thu, 31 Jul 2014 17:48:20 +0100
Subject: [PATCH] Filter attribute modifiers which cause the attribute to go
@ -6,7 +6,7 @@ Subject: [PATCH] Filter attribute modifiers which cause the attribute to go
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 4ab8c04..6155502 100644
index bd94dfd..1ea4cd5 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -49,6 +49,8 @@ import org.apache.commons.codec.binary.Base64;
@ -18,7 +18,7 @@ index 4ab8c04..6155502 100644
// Spigot end
/**
@@ -286,6 +288,123 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -287,6 +289,123 @@ class CraftMetaItem implements ItemMeta, Repairable {
NBTTagList save = null;
NBTTagList nbttaglist = tag.getList(ATTRIBUTES.NBT, 10);

6
CraftBukkit-Patches/0122-Plug-WorldMap-Memory-Leak.patch
View file

@ -1,4 +1,4 @@
From 8385829b979e3e632e8fd18104e42cc0ac37c1e0 Mon Sep 17 00:00:00 2001
From 2552e5f0042357218e78d9c7335d04ae8080660d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 8 Aug 2014 19:57:03 +1000
Subject: [PATCH] Plug WorldMap Memory Leak
@ -18,10 +18,10 @@ index fe59b75..936d6c6 100644
public PersistentCollection(IDataManager idatamanager) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b9730a2..4e2d03e 100644
index 950fc01..3282bc7 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1106,6 +1106,23 @@ public abstract class World implements IBlockAccess {
@@ -1107,6 +1107,23 @@ public abstract class World implements IBlockAccess {
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);

10
CraftBukkit-Patches/0124-Remove-uneeded-validation.patch
View file

@ -1,14 +1,14 @@
From 378adab1ba36476ea50786d6fbf0d556d6e0af6b Mon Sep 17 00:00:00 2001
From c0b42b0b351b20c907159dfade99fb1f5076617d 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 6155502..da70757 100644
index 1ea4cd5..22ffa53 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -242,7 +242,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -243,7 +243,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
this.lore = new ArrayList<String>(meta.lore);
}
@ -17,7 +17,7 @@ index 6155502..da70757 100644
this.enchantments = new HashMap<Enchantment, Integer>(meta.enchantments);
}
@@ -588,7 +588,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -589,7 +589,7 @@ class CraftMetaItem implements ItemMeta, Repairable {
}
static void applyEnchantments(Map<Enchantment, Integer> enchantments, NBTTagCompound tag, ItemMetaKey key) {
@ -26,7 +26,7 @@ index 6155502..da70757 100644
return;
}
@@ -675,7 +675,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -676,7 +676,14 @@ class CraftMetaItem implements ItemMeta, Repairable {
}
public boolean removeEnchant(Enchantment ench) {

6
CraftBukkit-Patches/0127-Skip-invalid-enchants-in-CraftMetaItem.patch
View file

@ -1,4 +1,4 @@
From acb91bd194d4976924dd94c91fead39af1744357 Mon Sep 17 00:00:00 2001
From ec87192015809a04175a70a35fbb3b435e35d5bf Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Tue, 19 Aug 2014 11:04:21 +0100
Subject: [PATCH] Skip invalid enchants in CraftMetaItem
@ -8,10 +8,10 @@ CraftMetaItem would add a null enchantment into the enchantment map which causes
NullPointers later
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index da70757..d389cb7 100644
index 22ffa53..97b9223 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -467,7 +467,11 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -468,7 +468,11 @@ class CraftMetaItem implements ItemMeta, Repairable {
int id = 0xffff & ((NBTTagCompound) ench.get(i)).getShort(ENCHANTMENTS_ID.NBT);
int level = 0xffff & ((NBTTagCompound) ench.get(i)).getShort(ENCHANTMENTS_LVL.NBT);

6
CraftBukkit-Patches/0128-Limit-TNT-Detonations-per-tick.patch
View file

@ -1,4 +1,4 @@
From 327d243191edb5d3df61e39aff22e98ad6ea0da7 Mon Sep 17 00:00:00 2001
From 57395f2eda1712904c340c75dee8543dc9567c23 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Aug 2014 18:12:32 -0400
Subject: [PATCH] Limit TNT Detonations per tick
@ -19,10 +19,10 @@ index 8f0c54c..0fbdbd6 100644
this.lastY = this.locY;
this.lastZ = this.locZ;
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 4e7005e..5455610 100644
index 76c19d7..e17fc63 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -632,6 +632,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -614,6 +614,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
this.worldProvider.s();
super.tickEntities();

6
CraftBukkit-Patches/0129-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
View file

@ -1,14 +1,14 @@
From 38b56355e12833e32ba7c8f34b76b92439628cf9 Mon Sep 17 00:00:00 2001
From 4719ed5e560cb9b407d05dcf516e2f04ddc8986e 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 d389cb7..4b70495 100644
index 97b9223..b20d0f2 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -992,6 +992,17 @@ class CraftMetaItem implements ItemMeta, Repairable {
@@ -994,6 +994,17 @@ class CraftMetaItem implements ItemMeta, Repairable {
// Spigot start
private final Spigot spigot = new Spigot()
{

8
CraftBukkit-Patches/0132-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From d2378c992e86deb39a6a1223e7bceb7fa20be7d3 Mon Sep 17 00:00:00 2001
From 0fb96c4f5b7a0e318cdbe6036d523f3db0867b92 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
@ -32,7 +32,7 @@ index 24462f1..9fc83c4 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b7fa693..bb066fa 100644
index 67a8d7b..5079995 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -130,6 +130,7 @@ import io.netty.buffer.Unpooled;
@ -65,7 +65,7 @@ index b7fa693..bb066fa 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 689308c..055c907 100644
index 09a1569..d057cce 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 689308c..055c907 100644
import net.minecraft.server.*;
import net.minecraft.server.PacketPlayOutTitle.EnumTitleAction;
@@ -1555,6 +1556,34 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1565,6 +1566,34 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}

10
CraftBukkit-Patches/0134-Allow-Capping-Tile-Entity-Tick-Time.patch
View file

@ -1,4 +1,4 @@
From 6100d235d3fce5df01ab99cbda85537eda720f6b Mon Sep 17 00:00:00 2001
From 3e9cce169a25432fea0b9e794de76a195766a60c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 20 Feb 2015 21:39:31 +1100
Subject: [PATCH] Allow Capping (Tile)Entity Tick Time.
@ -10,7 +10,7 @@ For tiles there is very little tradeoff for this option, as tile ticks are based
This feature was commisioned by Chunkr.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4e2d03e..a912719 100644
index 3282bc7..82d8d4f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -129,6 +129,9 @@ public abstract class World implements IBlockAccess {
@ -32,7 +32,7 @@ index 4e2d03e..a912719 100644
}
public World b() {
@@ -1423,7 +1428,12 @@ public abstract class World implements IBlockAccess {
@@ -1424,7 +1429,12 @@ public abstract class World implements IBlockAccess {
timings.entityTick.startTiming(); // Spigot
guardEntityList = true; // Spigot
// CraftBukkit start - Use field for loop variable
@ -46,7 +46,7 @@ index 4e2d03e..a912719 100644
entity = (Entity) this.entityList.get(this.tickPosition);
// CraftBukkit end
Entity entity1 = entity.bB();
@@ -1481,14 +1491,20 @@ public abstract class World implements IBlockAccess {
@@ -1482,14 +1492,20 @@ public abstract class World implements IBlockAccess {
this.tileEntityListUnload.clear();
}
// CraftBukkit end
@ -71,7 +71,7 @@ index 4e2d03e..a912719 100644
continue;
}
// Spigot end
@@ -1517,7 +1533,8 @@ public abstract class World implements IBlockAccess {
@@ -1518,7 +1534,8 @@ public abstract class World implements IBlockAccess {
}
if (tileentity.y()) {

8
CraftBukkit-Patches/0135-Use-FastMatches-for-ItemStack-Dirty-Check.patch
View file

@ -1,4 +1,4 @@
From 56fcf9d521b1588b3d52b0c534cd2d2f32fcc4fd Mon Sep 17 00:00:00 2001
From 599d77117a7ef1d05582ef470c119b58b5af7ac9 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 22 Feb 2015 12:27:40 +1100
Subject: [PATCH] Use FastMatches for ItemStack Dirty Check
@ -35,10 +35,10 @@ index a985405..686250e 100644
}
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 88211ab..92db67d 100644
index 861854b..c8694e8 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -454,6 +454,18 @@ public final class ItemStack {
@@ -461,6 +461,18 @@ public final class ItemStack {
return itemstack.isEmpty() && itemstack1.isEmpty() ? true : (!itemstack.isEmpty() && !itemstack1.isEmpty() ? (itemstack.tag == null && itemstack1.tag != null ? false : itemstack.tag == null || itemstack.tag.equals(itemstack1.tag)) : false);
}
@ -58,7 +58,7 @@ index 88211ab..92db67d 100644
return itemstack.isEmpty() && itemstack1.isEmpty() ? true : (!itemstack.isEmpty() && !itemstack1.isEmpty() ? itemstack.d(itemstack1) : false);
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index e7b602c..1a1f03b 100644
index 43cdf81..8302e9e 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -387,4 +387,9 @@ public class SpigotConfig

16
CraftBukkit-Patches/0138-Use-Map-for-getPlayer-String-lookup.patch
View file

@ -1,14 +1,14 @@
From 0249296bc64731c596287631e91cf9946e356e85 Mon Sep 17 00:00:00 2001
From 9dd97e58099d74401a1f4823d2746fd01c2372aa Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 13 Jul 2015 19:05:15 +1000
Subject: [PATCH] Use Map for getPlayer(String) lookup.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index bc0ba5e..5d6cadc 100644
index 29cd737..5359e8c 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -66,6 +66,7 @@ public abstract class PlayerList {
@@ -69,6 +69,7 @@ public abstract class PlayerList {
// CraftBukkit start
private CraftServer cserver;
@ -16,7 +16,7 @@ index bc0ba5e..5d6cadc 100644
public PlayerList(MinecraftServer minecraftserver) {
this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this);
@@ -320,6 +321,7 @@ public abstract class PlayerList {
@@ -323,6 +324,7 @@ public abstract class PlayerList {
public void onPlayerJoin(EntityPlayer entityplayer, String joinMessage) { // CraftBukkit added param
this.players.add(entityplayer);
@ -24,7 +24,7 @@ index bc0ba5e..5d6cadc 100644
this.j.put(entityplayer.getUniqueID(), entityplayer);
// this.sendAll(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer})); // CraftBukkit - replaced with loop below
WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
@@ -407,6 +409,7 @@ public abstract class PlayerList {
@@ -410,6 +412,7 @@ public abstract class PlayerList {
worldserver.kill(entityplayer);
worldserver.getPlayerChunkMap().removePlayer(entityplayer);
this.players.remove(entityplayer);
@ -32,7 +32,7 @@ index bc0ba5e..5d6cadc 100644
UUID uuid = entityplayer.getUniqueID();
EntityPlayer entityplayer1 = (EntityPlayer) this.j.get(uuid);
@@ -558,6 +561,7 @@ public abstract class PlayerList {
@@ -561,6 +564,7 @@ public abstract class PlayerList {
// entityplayer.x().getTracker().untrackEntity(entityplayer); // CraftBukkit
entityplayer.x().getPlayerChunkMap().removePlayer(entityplayer);
this.players.remove(entityplayer);
@ -40,7 +40,7 @@ index bc0ba5e..5d6cadc 100644
this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer);
BlockPosition blockposition = entityplayer.getBed();
boolean flag1 = entityplayer.isRespawnForced();
@@ -663,6 +667,7 @@ public abstract class PlayerList {
@@ -666,6 +670,7 @@ public abstract class PlayerList {
worldserver.getPlayerChunkMap().addPlayer(entityplayer1);
worldserver.addEntity(entityplayer1);
this.players.add(entityplayer1);
@ -48,7 +48,7 @@ index bc0ba5e..5d6cadc 100644
this.j.put(entityplayer1.getUniqueID(), entityplayer1);
}
// entityplayer1.syncInventory();
@@ -1133,19 +1138,7 @@ public abstract class PlayerList {
@@ -1147,19 +1152,7 @@ public abstract class PlayerList {
@Nullable
public EntityPlayer getPlayer(String s) {

6
CraftBukkit-Patches/0139-Clear-Packet-Queue-on-Disconnect.patch
View file

@ -1,4 +1,4 @@
From 7d0cfb973fbd19ef0ed658e9cddb626a65726f41 Mon Sep 17 00:00:00 2001
From a6c37ce695acc4461a94751e20f15a9113b2e071 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 22 Jul 2015 19:04:37 +1000
Subject: [PATCH] Clear Packet Queue on Disconnect
@ -17,10 +17,10 @@ index c2e9966..184ef32 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 15f2619..4c2e13f 100644
index 9914665..b583e9a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1069,7 +1069,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -1071,7 +1071,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
}
// CraftBukkit start

6
CraftBukkit-Patches/0140-Implement-SpawnerSpawnEvent.patch
View file

@ -1,4 +1,4 @@
From 5496b0e6e704c03fbad41ab853525cb617010de9 Mon Sep 17 00:00:00 2001
From a41c82f74e2e59f8d43bec3f4744e58e713257bb Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 3 Mar 2016 19:45:46 +1100
Subject: [PATCH] Implement SpawnerSpawnEvent.
@ -19,10 +19,10 @@ index 8ac4b83..5b41955 100644
ChunkRegionLoader.a(entity, world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
world.triggerEffect(2004, blockposition, 0);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index cbaf930..f80856a 100644
index 74faf99..1e7fdb5 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1002,6 +1002,21 @@ public class CraftEventFactory {
@@ -1009,6 +1009,21 @@ public class CraftEventFactory {
return event;
}