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

Update default spawn-range

Browse source
This commit is contained in:
md_5 2018-08-06 10:32:15 +10:00
parent 69774b3e44
commit 1503de9ce3
43 changed files with 186 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Bukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 28f1b85d4b66be8f2500acf576e114ff4afca2ba Mon Sep 17 00:00:00 2001
From 5e63d04d83d9a5781c43cf47de4fc4758e8a7b2d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 15 May 2017 15:16:15 +1000
Subject: [PATCH] Skeleton API Implementations
@ -93,10 +93,10 @@ index 752eeb5e..c77f3a4f 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 9d96976d..294eb7f7 100644
index 62bf70f5..72eae543 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -478,4 +478,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -508,4 +508,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
* @return reaction
*/
PistonMoveReaction getPistonMoveReaction();
@ -130,10 +130,10 @@ index c8b5154e..ee2218c1 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 2596a11d..2e8c19c5 100644
index 088b2163..11bcb277 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1437,4 +1437,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1484,4 +1484,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @return the player's locale
*/
public String getLocale();

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

@ -1,14 +1,14 @@
From b88c7edf3af4bcce30821a6763f1ed771efb1833 Mon Sep 17 00:00:00 2001
From 7e8038e58a001a7bccb474ffa4eb9f37799d07bc 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 2e8c19c5..32c66670 100644
index 11bcb277..057978eb 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1442,6 +1442,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1489,6 +1489,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public class Spigot extends Entity.Spigot
{

6
Bukkit-Patches/0011-Player-Collision-API.patch
View file

@ -1,14 +1,14 @@
From 7c31ac3a9c7e22b62640ba98f350192b8a546ad1 Mon Sep 17 00:00:00 2001
From 5f552603552089b236885e4e00b1afb17d5b31d7 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 32c66670..8e02f41a 100644
index 057978eb..067930f7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1452,6 +1452,31 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1499,6 +1499,31 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0013-Add-Getter-for-Entity-Invulnerability.patch
View file

@ -1,14 +1,14 @@
From bb37e5575e08877517d2b3dd4ed395f3de38c709 Mon Sep 17 00:00:00 2001
From 49f97240edb66695c60d19ebf26a81fd859ca2ce Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
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 294eb7f7..28b169d2 100644
index 72eae543..ddda34de 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -483,6 +483,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -513,6 +513,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
public class Spigot extends CommandSender.Spigot
{

6
Bukkit-Patches/0014-Add-respawn-API.patch
View file

@ -1,14 +1,14 @@
From 73ed6eb53fb3a831df4adef1eb449397c470637b Mon Sep 17 00:00:00 2001
From c52c2471b6c41a02413189b202bbb80cd318272d 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 8e02f41a..f7b13ac1 100644
index 067930f7..3f20bccc 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1477,6 +1477,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1524,6 +1524,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0015-Implement-Locale-Getter-for-Players.patch
View file

@ -1,14 +1,14 @@
From fae06377bcd68e5cb900329f03e946a7b2b0fed5 Mon Sep 17 00:00:00 2001
From b719252c39cc3fedbc5e6193108764eb6d0c614e 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 f7b13ac1..8c8876cc 100644
index 3f20bccc..5fe64f0f 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1485,6 +1485,18 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1532,6 +1532,18 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0016-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From c891bc28532673a8e94ad24630b99f13df21583c Mon Sep 17 00:00:00 2001
From 3f0f177dd64bd7c0d1ba71d537e98d8da58b39d7 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 8c8876cc..c0ffb7f6 100644
index 5fe64f0f..2b965d0c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1497,6 +1497,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1544,6 +1544,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0021-Undeprecate-Player-updateInventory-V.patch
View file

@ -1,14 +1,14 @@
From 697fa066c39fb97accb325dd610afeb0d49be801 Mon Sep 17 00:00:00 2001
From a978d157e5cd0882d2425aba71961d24d45c76ce Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu>
Date: Wed, 23 Jul 2014 15:50:36 -0400
Subject: [PATCH] Undeprecate Player#updateInventory()V
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index c0ffb7f6..4ce43d90 100644
index 2b965d0c..8afed5a2 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -395,10 +395,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -442,10 +442,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Forces an update of the player's entire inventory.
*

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

@ -1,4 +1,4 @@
From 0f352ea4cdb1c526e76e64874adfef17d241c867 Mon Sep 17 00:00:00 2001
From 2cb67f7fef335e082bafb68c772623ac35a758ab 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
@ -325,10 +325,10 @@ index 5dcd2218..abf68a2c 100644
Spigot spigot();
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 4ce43d90..115c5b0b 100644
index 8afed5a2..9ed53bb4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1505,6 +1505,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1552,6 +1552,36 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

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

@ -1,4 +1,4 @@
From 3f197d8179238db9284a8cd16144060bf8b3ad7c Mon Sep 17 00:00:00 2001
From 422ba648571f6efce0452faa8910128fd8f79569 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
@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations
This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 61d9fa33c..d9239d358 100644
index abc08ed39..4cc768875 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1768,4 +1768,14 @@ public final class CraftServer implements Server {
@@ -1770,4 +1770,14 @@ public final class CraftServer implements Server {
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}
@ -101,10 +101,10 @@ index e47080db8..11ad076e1 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 64cfc9515..9c9d49800 100644
index 5f8a9e425..029094f8d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -736,4 +736,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -746,4 +746,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
return perm;
}
@ -141,10 +141,10 @@ index 64e346d84..194d830e1 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 c41294ffc..02bf84009 100644
index c10816cfd..b88ad1da5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1575,4 +1575,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1618,4 +1618,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public String getLocale() {
return getHandle().locale;
}
@ -180,7 +180,7 @@ index c8654c68f..0c1bca2bd 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 f47a36236..bbb72e3b5 100644
index 6623ae127..9b8f0627e 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -966,4 +966,16 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {

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

@ -1,4 +1,4 @@
From 7258a9a81704a9011d3598d084bcf94eb0a932db Mon Sep 17 00:00:00 2001
From 270ed681b8340875f52744947cd31c2f6684df65 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 13a0ed127..9a20b640d 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 28cb33095..457e868d8 100644
index 47b02c86c..0ce659339 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -864,6 +864,23 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -875,6 +875,23 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
} else if (entity.getBukkitEntity() instanceof org.bukkit.entity.Vehicle){
event = CraftEventFactory.callVehicleCreateEvent(entity);
}

18
CraftBukkit-Patches/0007-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From 0f2fe6acdf257b005b7784967d0fe1664360f318 Mon Sep 17 00:00:00 2001
From 31f53a8caa44b9b9ed06a9af5cfc680553730e41 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
@ -79,10 +79,10 @@ index 0a59da7d5..6e940b640 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 457e868d8..882fa397f 100644
index 0ce659339..8c80aab59 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -840,6 +840,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -851,6 +851,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@ -90,7 +90,7 @@ index 457e868d8..882fa397f 100644
if (entity == null) return false;
org.bukkit.event.Cancellable event = null;
@@ -930,6 +931,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -941,6 +942,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
public void kill(Entity entity) {
@ -98,7 +98,7 @@ index 457e868d8..882fa397f 100644
if (entity.isVehicle()) {
entity.ejectPassengers();
}
@@ -948,6 +950,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -959,6 +961,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
public void removeEntity(Entity entity) {
@ -106,7 +106,7 @@ index 457e868d8..882fa397f 100644
entity.b(false);
entity.die();
if (entity instanceof EntityHuman) {
@@ -2157,6 +2160,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -2168,6 +2171,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
public void a(Collection<Entity> collection) {
@ -115,7 +115,7 @@ index 457e868d8..882fa397f 100644
// this.entityList.addAll(collection);
Iterator iterator = collection.iterator();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7a437cd27..0140df40a 100644
index 04b618f4b..fddb1055d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -669,6 +669,7 @@ public final class CraftServer implements Server {
@ -155,10 +155,10 @@ index 6a87562b6..08765768a 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 02bf84009..093b5a8f4 100644
index b88ad1da5..69770a803 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -250,6 +250,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -293,6 +293,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {

36
CraftBukkit-Patches/0009-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From cd4d1518d647449b0a14d1bf99ba9bd25ed416e6 Mon Sep 17 00:00:00 2001
From a601b5d8f27232a6775f23e9e9204f9f55795c9f 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
@ -100,7 +100,7 @@ index b8a4b0bdd..dbd74d384 100644
public boolean S() {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 015c6ab69..e7f989686 100644
index 98becf844..d0cc0e103 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -29,6 +29,7 @@ import org.bukkit.command.CommandSender;
@ -111,7 +111,7 @@ index 015c6ab69..e7f989686 100644
import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
@@ -157,6 +158,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -159,6 +160,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
public boolean valid;
public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
public boolean forceExplosionKnockback; // SPIGOT-949
@ -119,7 +119,7 @@ index 015c6ab69..e7f989686 100644
public float getBukkitYaw() {
return this.yaw;
@@ -525,6 +527,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -527,6 +529,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
}
public void move(EnumMoveType enummovetype, double d0, double d1, double d2) {
@ -127,7 +127,7 @@ index 015c6ab69..e7f989686 100644
if (this.noclip) {
this.a(this.getBoundingBox().d(d0, d1, d2));
this.recalcPosition();
@@ -893,6 +896,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -875,6 +878,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
this.world.methodProfiler.e();
}
@ -211,7 +211,7 @@ index caccb1a15..6f8572573 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 55022c848..de497fa50 100644
index c5aea8199..6510a5b15 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -62,6 +62,7 @@ import org.bukkit.Bukkit;
@ -389,7 +389,7 @@ index cde437933..331029284 100644
private final TileEntityTypes<?> e;
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 882fa397f..2a13b29f4 100644
index 8c80aab59..cceab7750 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -20,6 +20,7 @@ import com.google.common.collect.Maps;
@ -417,7 +417,7 @@ index 882fa397f..2a13b29f4 100644
}
public GeneratorAccess b() {
@@ -1061,6 +1065,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1072,6 +1076,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
CrashReportSystemDetails crashreportsystemdetails1;
CrashReport crashreport1;
@ -425,7 +425,7 @@ index 882fa397f..2a13b29f4 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);
@@ -1078,7 +1083,9 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1089,7 +1094,9 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
this.methodProfiler.a("tick");
if (!entity.dead && !(entity instanceof EntityPlayer)) {
try {
@ -435,7 +435,7 @@ index 882fa397f..2a13b29f4 100644
} catch (Throwable throwable1) {
crashreport1 = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
@@ -1104,7 +1111,9 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1115,7 +1122,9 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
this.methodProfiler.e();
}
@ -445,7 +445,7 @@ index 882fa397f..2a13b29f4 100644
if (!this.tileEntityListUnload.isEmpty()) {
this.tileEntityListTick.removeAll(this.tileEntityListUnload);
this.tileEntityList.removeAll(this.tileEntityListUnload);
@@ -1125,6 +1134,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1136,6 +1145,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
this.methodProfiler.a(() -> {
return String.valueOf(TileEntityTypes.a(tileentity.C()));
});
@ -453,7 +453,7 @@ index 882fa397f..2a13b29f4 100644
((ITickable) tileentity).Y_();
this.methodProfiler.e();
} catch (Throwable throwable2) {
@@ -1133,6 +1143,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1144,6 +1154,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
tileentity.a(crashreportsystemdetails1);
throw new ReportedException(crashreport1);
}
@ -465,7 +465,7 @@ index 882fa397f..2a13b29f4 100644
}
}
@@ -1145,6 +1160,8 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1156,6 +1171,8 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
}
@ -474,7 +474,7 @@ index 882fa397f..2a13b29f4 100644
this.J = false;
this.methodProfiler.c("pendingBlockEntities");
if (!this.c.isEmpty()) {
@@ -1177,6 +1194,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1188,6 +1205,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
this.c.clear();
}
@ -482,7 +482,7 @@ index 882fa397f..2a13b29f4 100644
this.methodProfiler.e();
this.methodProfiler.e();
}
@@ -1231,6 +1249,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1242,6 +1260,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
// CraftBukkit end
@ -490,7 +490,7 @@ index 882fa397f..2a13b29f4 100644
entity.N = entity.locX;
entity.O = entity.locY;
entity.P = entity.locZ;
@@ -1301,6 +1320,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1312,6 +1331,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
}
}
@ -556,10 +556,10 @@ index a9a257b95..4d5bede24 100644
public boolean j_() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0140df40a..eebed5b20 100644
index fddb1055d..13f03e6d7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1776,6 +1776,11 @@ public final class CraftServer implements Server {
@@ -1778,6 +1778,11 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{

6
CraftBukkit-Patches/0010-Fix-Mob-Spawning-Relative-to-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 57f02a5f69eb4b3257901cf2b67e1bbcefc3dea6 Mon Sep 17 00:00:00 2001
From 6aa955a83cf6aca67478b02f09c8f78c0c7fc31f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:29:54 +1000
Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@ -32,7 +32,7 @@ index da3229cec..e54dcaa99 100644
// CraftBukkit start - use LongHash and LongHashSet
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index f5096e3a4..3dee3ff5e 100644
index f5096e3a4..5aa21d910 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -126,4 +126,11 @@ public class SpigotWorldConfig
@ -43,7 +43,7 @@ index f5096e3a4..3dee3ff5e 100644
+ public byte mobSpawnRange;
+ private void mobSpawnRange()
+ {
+ mobSpawnRange = (byte) getInt( "mob-spawn-range", 4 );
+ mobSpawnRange = (byte) getInt( "mob-spawn-range", 6 );
+ log( "Mob Spawn Range: " + mobSpawnRange );
+ }
}

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

@ -1,14 +1,14 @@
From cedc15f61f7a77c75d8c64c7eec343d8ee2078b1 Mon Sep 17 00:00:00 2001
From 7dda52996cab32f849cce2c2a0678e1d7598f063 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 2a13b29f4..7367dac45 100644
index cceab7750..4770beefb 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1125,6 +1125,13 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1136,6 +1136,13 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();

6
CraftBukkit-Patches/0012-Item-Despawn-Rate.patch
View file

@ -1,4 +1,4 @@
From 2ab9f497a835e3c4592e494e4a220bb8976879da Mon Sep 17 00:00:00 2001
From 0ad78736272d55ebc86c01747cf64b0f86605cd7 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 22 Sep 2013 19:10:53 +1000
Subject: [PATCH] Item Despawn Rate
@ -26,11 +26,11 @@ index 9a20b640d..0ac47b585 100644
}
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 3dee3ff5e..6a8b5cd32 100644
index 5aa21d910..fedd9d9be 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -133,4 +133,11 @@ public class SpigotWorldConfig
mobSpawnRange = (byte) getInt( "mob-spawn-range", 4 );
mobSpawnRange = (byte) getInt( "mob-spawn-range", 6 );
log( "Mob Spawn Range: " + mobSpawnRange );
}
+

18
CraftBukkit-Patches/0013-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From 0172a99e6dbe322c05ee0b184e3675f77f3276ce Mon Sep 17 00:00:00 2001
From 15e004a49a11c0e1d2a1de4de9beac9c4f02a572 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
@ -9,10 +9,10 @@ This will drastically cut down on tick timings for entities that are not in rang
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e7f989686..855f7ff0a 100644
index d0cc0e103..6fe6fc523 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -159,6 +159,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -161,6 +161,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
public boolean forceExplosionKnockback; // SPIGOT-949
public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
@ -25,7 +25,7 @@ index e7f989686..855f7ff0a 100644
public float getBukkitYaw() {
return this.yaw;
@@ -185,7 +191,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -187,7 +193,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
this.setPosition(0.0D, 0.0D, 0.0D);
if (world != null) {
this.dimension = world.worldProvider.getDimensionManager().getDimensionID();
@ -195,10 +195,10 @@ index aacb270fc..32893a32c 100644
if (--this.profession <= 0) {
BlockPosition blockposition = new BlockPosition(this);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7367dac45..ce5fa30b2 100644
index 4770beefb..79f803899 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1065,6 +1065,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1076,6 +1076,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
CrashReportSystemDetails crashreportsystemdetails1;
CrashReport crashreport1;
@ -206,7 +206,7 @@ index 7367dac45..ce5fa30b2 100644
timings.entityTick.startTiming(); // Spigot
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
@@ -1250,8 +1251,12 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1261,8 +1262,12 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
// CraftBukkit start - check if chunks are loaded as done in previous versions
// TODO: Go back to Vanilla behaviour when comfortable
@ -236,7 +236,7 @@ index fa88be0db..4c8ab2bc9 100644
public static final HashMap<String, CustomTimingsHandler> tileEntityTypeTimingMap = new HashMap<String, CustomTimingsHandler>();
public static final HashMap<String, CustomTimingsHandler> pluginTaskTimingMap = new HashMap<String, CustomTimingsHandler>();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 9c9d49800..83eb07888 100644
index 029094f8d..8c9ac1619 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -302,6 +302,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -541,7 +541,7 @@ index 000000000..635653abc
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 6a8b5cd32..1d7544ee7 100644
index fedd9d9be..33ab3dfb4 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -140,4 +140,17 @@ public class SpigotWorldConfig

6
CraftBukkit-Patches/0015-PlayerItemDamageEvent.patch
View file

@ -1,14 +1,14 @@
From 898a00278c68bf9aa8fb12f7d20b82d2e8f88216 Mon Sep 17 00:00:00 2001
From 8affde3de5ba6f4fb1971bfccee73ceb3f3bde3d 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 4cca55677..0d26fc56d 100644
index ed666a814..359979cc1 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -356,6 +356,18 @@ public final class ItemStack {
@@ -362,6 +362,18 @@ public final class ItemStack {
}
i -= k;

10
CraftBukkit-Patches/0023-Allow-Disabling-of-Command-TabComplete.patch
View file

@ -1,14 +1,14 @@
From b4b0625682c1adc23770b0a9ee98a00852a6ffed Mon Sep 17 00:00:00 2001
From bd92fb505169974e41f79ca269931377c2229943 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
index 8c7c8a043..c9eadd560 100644
index 51b7e4297..dc74b79a7 100644
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -247,6 +247,7 @@ public class CommandDispatcher {
@@ -248,6 +248,7 @@ public class CommandDispatcher {
}
public void a(EntityPlayer entityplayer) {
@ -16,7 +16,7 @@ index 8c7c8a043..c9eadd560 100644
// CraftBukkit start
// Register Vanilla commands into builtRoot as before
Map hashmap = Maps.newIdentityHashMap(); // Use identity to prevent aliasing issues
@@ -270,6 +271,7 @@ public class CommandDispatcher {
@@ -286,6 +287,7 @@ public class CommandDispatcher {
while (iterator.hasNext()) {
CommandNode commandnode2 = (CommandNode) iterator.next();
@ -25,7 +25,7 @@ index 8c7c8a043..c9eadd560 100644
if (commandnode2.canUse(commandlistenerwrapper)) {
ArgumentBuilder argumentbuilder = commandnode2.createBuilder();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a535ee860..9882ce4ef 100644
index 6dff5f3b1..181912646 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1595,6 +1595,13 @@ public final class CraftServer implements Server {

8
CraftBukkit-Patches/0026-Properly-Close-Inventories.patch
View file

@ -1,4 +1,4 @@
From f9c567fac70730fe2e78ffd0880c1166d4eff8ee Mon Sep 17 00:00:00 2001
From 4167e7c17a55ccc65c78b371ff15a5c5ca32fe3b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories
@ -6,10 +6,10 @@ Subject: [PATCH] Properly Close Inventories
Properly close inventories when unloading and switching worlds.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index a45387427..daa126825 100644
index db69eecb8..cfd844e93 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -780,6 +780,18 @@ public class Chunk implements IChunkAccess {
@@ -791,6 +791,18 @@ public class Chunk implements IChunkAccess {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();
@ -28,7 +28,7 @@ index a45387427..daa126825 100644
this.world.b(tileentity);
}
@@ -793,6 +805,18 @@ public class Chunk implements IChunkAccess {
@@ -804,6 +816,18 @@ public class Chunk implements IChunkAccess {
java.util.Iterator<Entity> iter = newList.iterator();
while (iter.hasNext()) {
Entity entity = iter.next();

8
CraftBukkit-Patches/0028-Entity-Mount-and-Dismount-Events.patch
View file

@ -1,14 +1,14 @@
From 7743aa7d4e56ca2e500ef013667015545a678d02 Mon Sep 17 00:00:00 2001
From 1ac2eb88cce5d554776038e945a59d903502120b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 27 Feb 2016 10:07:58 +1100
Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b00703c65..3de248e14 100644
index 6fe6fc523..cb22a3bff 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2005,6 +2005,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -1994,6 +1994,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
}
}
// CraftBukkit end
@ -22,7 +22,7 @@ index b00703c65..3de248e14 100644
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bO() instanceof EntityHuman)) {
this.passengers.add(0, entity);
} else {
@@ -2034,6 +2041,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -2023,6 +2030,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
}
}
// CraftBukkit end

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

@ -1,14 +1,14 @@
From 92d4dbb97be7e481949b3536925b6449eec43f1c Mon Sep 17 00:00:00 2001
From d8f501aa6fcb85a23c2f75acf005c10471f75c85 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 db1338561..5eead2833 100644
index 69770a803..9c510cd73 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1580,6 +1580,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1623,6 +1623,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

6
CraftBukkit-Patches/0033-Add-Getter-for-Entity-Invulnerability.patch
View file

@ -1,14 +1,14 @@
From f8aab71559d31df53a9c43de94818b675e9cb654 Mon Sep 17 00:00:00 2001
From 17844d0f5ea27b75c30da9f14afbe6fc7e98dda2 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
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 83eb07888..91d165746 100644
index 8c9ac1619..0322063bc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -741,6 +741,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -751,6 +751,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// Spigot start
private final Spigot spigot = new Spigot()
{

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

@ -1,14 +1,14 @@
From c5598619e21173fac2fd4d0e47ea20c1cba99b0a Mon Sep 17 00:00:00 2001
From 2e528cecda24ec486cfba075a61afad5125f8de4 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 5eead2833..3ce1218a4 100644
index 9c510cd73..d1a8a82da 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1590,6 +1590,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1633,6 +1633,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setCollidesWithEntities(boolean collides) {
CraftPlayer.this.setCollidable(collides);
}

8
CraftBukkit-Patches/0037-Watchdog-Thread.patch
View file

@ -1,4 +1,4 @@
From e98cc9d778a58a60c84ca25939774b7a05feea2c Mon Sep 17 00:00:00 2001
From 66d4f9dc97fde454bef4d4af48963c1ddf588976 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 5 Aug 2014 17:20:19 +0100
Subject: [PATCH] Watchdog Thread.
@ -18,7 +18,7 @@ index dbd74d384..f90a43929 100644
thread1.setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(DedicatedServer.LOGGER));
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4b865bc97..af93b811c 100644
index d8fd439c5..f4512a2c0 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -714,6 +714,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -38,10 +38,10 @@ index 4b865bc97..af93b811c 100644
org.spigotmc.CustomTimingsHandler.tick(); // Spigot
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 849f2c236..87be3a337 100644
index 56e735fac..d923c6dab 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1813,6 +1813,11 @@ public final class CraftServer implements Server {
@@ -1815,6 +1815,11 @@ public final class CraftServer implements Server {
{
return org.spigotmc.SpigotConfig.config;
}

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

@ -1,4 +1,4 @@
From 8c03cc5fcaf508c648a33d0fe5db1dfd44004027 Mon Sep 17 00:00:00 2001
From 25819d64b2156a716a8e89aaa7bb760f2d3f176f 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
@ -130,7 +130,7 @@ index 668452809..9d0e29df7 100644
if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.k.get(gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 87be3a337..b27bdc7ca 100644
index d923c6dab..1da582e77 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -607,7 +607,13 @@ public final class CraftServer implements Server {
@ -149,10 +149,10 @@ index 87be3a337..b27bdc7ca 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 ced5f7371..06b61faab 100644
index d1a8a82da..327e9ab24 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1581,6 +1581,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1624,6 +1624,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private final Player.Spigot spigot = new Player.Spigot()
{

8
CraftBukkit-Patches/0044-Save-ticks-lived-to-nbttag.patch
View file

@ -1,14 +1,14 @@
From 9805c14a8207f1f272163f1b522b344ef6fe6027 Mon Sep 17 00:00:00 2001
From b458675a60765838f41365b5f29f9519ae253413 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Tue, 9 Jul 2013 00:11:12 +0200
Subject: [PATCH] Save ticks lived to nbttag
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0e90fd362..5017c95dd 100644
index cb22a3bff..80bc60a81 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1566,6 +1566,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -1548,6 +1548,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
nbttagcompound.setLong("WorldUUIDLeast", this.world.getDataManager().getUUID().getLeastSignificantBits());
nbttagcompound.setLong("WorldUUIDMost", this.world.getDataManager().getUUID().getMostSignificantBits());
nbttagcompound.setInt("Bukkit.updateLevel", CURRENT_LEVEL);
@ -16,7 +16,7 @@ index 0e90fd362..5017c95dd 100644
// CraftBukkit end
IChatBaseComponent ichatbasecomponent = this.getCustomName();
@@ -1717,6 +1718,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -1699,6 +1700,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
if (this instanceof EntityLiving) {
EntityLiving entity = (EntityLiving) this;

8
CraftBukkit-Patches/0045-Add-Option-to-Nerf-Mobs-from-Spawners.patch
View file

@ -1,14 +1,14 @@
From 8aaeef929cb618d455cb2385083bca339b3da902 Mon Sep 17 00:00:00 2001
From b8a61e672998b4d2575faf4ff47e56ce0e334c3f Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 2 Feb 2014 16:55:46 +0000
Subject: [PATCH] Add Option to Nerf Mobs from Spawners
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 5017c95dd..03e395aed 100644
index 80bc60a81..522d00f35 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -163,6 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -165,6 +165,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState;
public long activatedTick = Integer.MIN_VALUE;
@ -52,7 +52,7 @@ index 3bb5a06cb..967308d97 100644
world.triggerEffect(2004, blockposition, 0);
if (entityinsentient != null) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 14e33e588..6c5068413 100644
index 6f989ccfa..7bd25baa0 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -205,4 +205,11 @@ public class SpigotWorldConfig

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

@ -1,14 +1,14 @@
From 6be643139b67f68b9c43a85398d096bf9ccaa789 Mon Sep 17 00:00:00 2001
From dac94950cf78d65d89fa2ad3e9084b9113792a01 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 6290c9374..5f9b27624 100644
index 327e9ab24..994759ec7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1380,7 +1380,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1423,7 +1423,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {

8
CraftBukkit-Patches/0050-Improve-AutoSave-Mechanism.patch
View file

@ -1,4 +1,4 @@
From d5389b05f44a1ecd02d452f29952f3b7fe0e3438 Mon Sep 17 00:00:00 2001
From f36ddfc62fb676f9db019e0501343d89487c9780 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
@ -11,10 +11,10 @@ Instead we will mimic the save-all command in its behaviour, which is both safe
Also, only save modified chunks, or chunks with entities after 4 auto save passes
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index daa126825..78bfd9fe9 100644
index cfd844e93..d3e908ef3 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -901,7 +901,7 @@ public class Chunk implements IChunkAccess {
@@ -912,7 +912,7 @@ public class Chunk implements IChunkAccess {
if (this.w && this.world.getTime() != this.lastSaved || this.y) {
return true;
}
@ -37,7 +37,7 @@ index 410601d5f..287487150 100644
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0c776692b..7aa788871 100644
index ac29ac5e5..e73f29ffd 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -805,7 +805,17 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati

6
CraftBukkit-Patches/0056-Implement-Locale-Getter-for-Players.patch
View file

@ -1,14 +1,14 @@
From 3201138841ef933823db953524673fd221537c99 Mon Sep 17 00:00:00 2001
From cc1be80c8e017ce76bd4444c6063705433b0bc49 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/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5f9b27624..b9e541380 100644
index 994759ec7..dc1fccb6c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1605,6 +1605,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1648,6 +1648,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
}
}

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

@ -1,14 +1,14 @@
From f91b97a9effd88b54c64c056fea59e299d9b013e Mon Sep 17 00:00:00 2001
From eeab8716707de13a63636fe9941acf56f09e9a4f 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 b9e541380..a2ab1c194 100644
index dc1fccb6c..804b8fc0c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1611,6 +1611,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1654,6 +1654,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
return getHandle().locale;
}

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

@ -1,14 +1,14 @@
From 53bac13f71688798724fc859ecd09e44eeb94b55 Mon Sep 17 00:00:00 2001
From bfad98447d09a8e45b76c6e941ef872a8fba882e 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 a2ab1c194..4aa50915a 100644
index 804b8fc0c..03a21f549 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1198,6 +1198,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1241,6 +1241,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void addChannel(String channel) {

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

@ -1,11 +1,11 @@
From e939bbe74f0757b7c829834e99b0fc9070dbda5f Mon Sep 17 00:00:00 2001
From 1272d2ea55f57fcabf102df9b7ae748f94c0e0d0 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 ce5fa30b2..f751fafa9 100644
index 79f803899..7d8696c37 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -38,7 +38,32 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@ -50,7 +50,7 @@ index ce5fa30b2..f751fafa9 100644
public CraftWorld getWorld() {
return this.world;
@@ -1067,6 +1093,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1078,6 +1104,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
timings.entityTick.startTiming(); // Spigot
@ -58,7 +58,7 @@ index ce5fa30b2..f751fafa9 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);
@@ -1105,12 +1132,15 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1116,12 +1143,15 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
this.getChunkAt(j, l).b(entity);
}

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

@ -1,4 +1,4 @@
From 16f40ed10458c25decc5da89c6f1925cbf1cde87 Mon Sep 17 00:00:00 2001
From 90cd919e42c4b944b9eddb558e97a4cf7267dd5d 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 f751fafa9..4223b219a 100644
index 7d8696c37..af4469237 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 f751fafa9..4223b219a 100644
import com.google.common.base.MoreObjects;
import com.google.common.collect.Lists;
@@ -988,6 +988,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -999,6 +999,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
this.everyoneSleeping();
}
@ -23,7 +23,7 @@ index f751fafa9..4223b219a 100644
int i = entity.ae;
int j = entity.ag;
@@ -1004,6 +1005,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1015,6 +1016,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
this.entityList.remove(index);
}
// CraftBukkit end

10
CraftBukkit-Patches/0068-Descriptive-kick-reasons-instead-of-Nope.patch
View file

@ -1,14 +1,14 @@
From f546f98e686f069e6ce25bfaf5f64ffd174e92ae Mon Sep 17 00:00:00 2001
From f8e1ab6b54c54db0e7b89fd93e96cfa46fdab292 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!
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 03e395aed..5046ecb3b 100644
index 522d00f35..55bf00be9 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -289,7 +289,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -291,7 +291,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
if (f == Float.POSITIVE_INFINITY || f == Float.NEGATIVE_INFINITY) {
if (this instanceof EntityPlayer) {
this.world.getServer().getLogger().warning(this.getName() + " was caught trying to crash the server with an invalid yaw");
@ -17,7 +17,7 @@ index 03e395aed..5046ecb3b 100644
}
f = 0;
}
@@ -302,7 +302,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -304,7 +304,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
if (f1 == Float.POSITIVE_INFINITY || f1 == Float.NEGATIVE_INFINITY) {
if (this instanceof EntityPlayer) {
this.world.getServer().getLogger().warning(this.getName() + " was caught trying to crash the server with an invalid pitch");
@ -27,7 +27,7 @@ index 03e395aed..5046ecb3b 100644
f1 = 0;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a105669a6..862449c98 100644
index 340a2c0d6..8d4c92876 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1388,7 +1388,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

6
CraftBukkit-Patches/0082-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
View file

@ -1,11 +1,11 @@
From ec0988d648446c8670f7b56d06ef8ceb0253a7e0 Mon Sep 17 00:00:00 2001
From 5ba2f4420a9db83a371ca517c053071a8ca20a4e Mon Sep 17 00:00:00 2001
From: David <dmck2b@gmail.com>
Date: Mon, 21 Apr 2014 12:43:08 +0100
Subject: [PATCH] Prevent NoClassDefError crash and notify on crash
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4223b219a..371e9ed7e 100644
index af4469237..d772d0e8a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -129,6 +129,8 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@ -17,7 +17,7 @@ index 4223b219a..371e9ed7e 100644
public CraftWorld getWorld() {
return this.world;
@@ -515,6 +517,10 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -526,6 +528,10 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
// CraftBukkit end
iblockdata.doPhysics(this, blockposition, block, blockposition1);

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

@ -1,14 +1,14 @@
From d557c7dbc97ead129a9d643b0c7fd074b010b984 Mon Sep 17 00:00:00 2001
From 5ff77ef136f8a177e581ac214e98728fcabd91b3 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 4aa50915a..d423b8c76 100644
index 03a21f549..36365bce0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1455,7 +1455,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1498,7 +1498,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
break;
}
}

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

@ -1,14 +1,14 @@
From 7f13ffa682dd4e9c4930f327381746c7abd163f0 Mon Sep 17 00:00:00 2001
From 4e9b1ff7edb68651e8c1dffbf3af9b32300016e5 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 371e9ed7e..9320d88c1 100644
index d772d0e8a..3df194528 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1713,6 +1713,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1724,6 +1724,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
}

8
CraftBukkit-Patches/0106-Plug-WorldMap-Memory-Leak.patch
View file

@ -1,4 +1,4 @@
From 3f54d8c7e9f913bb82e80ca110aa5b91b11c7665 Mon Sep 17 00:00:00 2001
From 2ab401f758fd954f9beb48a658bc142c65f73875 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 855192af3..6b5600ba5 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 9320d88c1..dfcafc6d4 100644
index 3df194528..efd9dc9a9 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -979,6 +979,23 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -990,6 +990,23 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
@ -46,7 +46,7 @@ index 9320d88c1..dfcafc6d4 100644
this.c(entity);
}
diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
index 51fa1b1b9..445a016b7 100644
index afe676301..c73ffc3bc 100644
--- a/src/main/java/net/minecraft/server/WorldMap.java
+++ b/src/main/java/net/minecraft/server/WorldMap.java
@@ -26,7 +26,7 @@ public class WorldMap extends PersistentBase {

14
CraftBukkit-Patches/0114-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From a5604675760eba02c74aa06077c33a796a7188da Mon Sep 17 00:00:00 2001
From f7da014334bdb59b45fd12e8e4eba4cd3195fa42 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 e55384e70..28a262835 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index adc16e046..1232ea4b2 100644
index b810024dd..7cd9b3b8c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -150,6 +150,7 @@ import org.bukkit.craftbukkit.tag.CraftBlockTag;
@ -43,7 +43,7 @@ index adc16e046..1232ea4b2 100644
public final class CraftServer implements Server {
private final String serverName = "CraftBukkit";
@@ -1843,6 +1844,20 @@ public final class CraftServer implements Server {
@@ -1845,6 +1846,20 @@ public final class CraftServer implements Server {
public void restart() {
org.spigotmc.RestartCommand.restart();
}
@ -87,10 +87,10 @@ index c10a84452..5c3421dd3 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index eef88cea6..72164e11a 100644
index 2564bdf4d..b542b17fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -753,6 +753,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -763,6 +763,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
{
return getHandle().isInvulnerable(net.minecraft.server.DamageSource.GENERIC);
}
@ -108,7 +108,7 @@ index eef88cea6..72164e11a 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 5d7f09ef4..75d56ee3b 100644
index 36365bce0..2d09bb4fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -23,6 +23,7 @@ import java.util.UUID;
@ -119,7 +119,7 @@ index 5d7f09ef4..75d56ee3b 100644
import net.minecraft.server.AdvancementDataPlayer;
import net.minecraft.server.AdvancementProgress;
@@ -1632,6 +1633,38 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1675,6 +1676,38 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}

12
CraftBukkit-Patches/0115-Allow-Capping-Tile-Entity-Tick-Time.patch
View file

@ -1,4 +1,4 @@
From 65a6bce57cb870c980fc8add3f6b63e0e6fbbcbc Mon Sep 17 00:00:00 2001
From ff7239a683ec544d94c7ddd6de2f90d2114c3bc8 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 dfcafc6d4..13c404337 100644
index efd9dc9a9..73bd5e1d7 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -131,6 +131,9 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@ -32,7 +32,7 @@ index dfcafc6d4..13c404337 100644
}
public GeneratorAccess b() {
@@ -1120,7 +1125,12 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1131,7 +1136,12 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
timings.entityTick.startTiming(); // Spigot
guardEntityList = true; // Spigot
// CraftBukkit start - Use field for loop variable
@ -46,7 +46,7 @@ index dfcafc6d4..13c404337 100644
entity = (Entity) this.entityList.get(this.tickPosition);
// CraftBukkit end
Entity entity1 = entity.getVehicle();
@@ -1177,14 +1187,19 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1188,14 +1198,19 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
this.J = true;
@ -71,7 +71,7 @@ index dfcafc6d4..13c404337 100644
continue;
}
// Spigot end
@@ -1215,7 +1230,8 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -1226,7 +1241,8 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
}
if (tileentity.x()) {
@ -82,7 +82,7 @@ index dfcafc6d4..13c404337 100644
if (this.isLoaded(tileentity.getPosition())) {
this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 49e70a7c1..e146308ba 100644
index 0bddf8f72..e9c68cf13 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -297,4 +297,13 @@ public class SpigotWorldConfig

10
CraftBukkit-Patches/0116-Use-Standard-List-for-EntitySlices.patch
View file

@ -1,11 +1,11 @@
From 36e4a106937308a374f6c30cfe29a9b7b9400705 Mon Sep 17 00:00:00 2001
From 53261113d582266e3995b4498dc9c2d36149cbfc Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 20 Feb 2015 21:33:36 +1100
Subject: [PATCH] Use Standard List for EntitySlices.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 78bfd9fe9..411ab6061 100644
index d3e908ef3..03c96de98 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -41,7 +41,7 @@ public class Chunk implements IChunkAccess {
@ -49,7 +49,7 @@ index 78bfd9fe9..411ab6061 100644
this.world.a((Collection) entityslice);
}
@@ -796,7 +796,7 @@ public class Chunk implements IChunkAccess {
@@ -807,7 +807,7 @@ public class Chunk implements IChunkAccess {
this.world.b(tileentity);
}
@ -58,7 +58,7 @@ index 78bfd9fe9..411ab6061 100644
int i = aentityslice.length;
for (int j = 0; j < i; ++j) {
@@ -883,12 +883,12 @@ public class Chunk implements IChunkAccess {
@@ -894,12 +894,12 @@ public class Chunk implements IChunkAccess {
j = MathHelper.clamp(j, 0, this.entitySlices.length - 1);
for (int k = i; k <= j; ++k) {
@ -73,7 +73,7 @@ index 78bfd9fe9..411ab6061 100644
list.add((T) entity); // Fix decompile error
}
}
@@ -1043,7 +1043,7 @@ public class Chunk implements IChunkAccess {
@@ -1054,7 +1054,7 @@ public class Chunk implements IChunkAccess {
return this.tileEntities;
}