CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update SpigotMC's patches

Browse Source 
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK
e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge
d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch
068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
This commit is contained in:
Zach Brown 2014-11-30 16:16:48 -06:00
parent af814004a5
commit 19972e09b8
191 changed files with 409 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From dd1ac6c30d00ee3df85d519665f0542dce550125 Mon Sep 17 00:00:00 2001
From 626a7293d8a78d0aa5383605240d53a57f93dd53 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes

22
Bukkit-Patches/0002-Spigot-Timings.patch
View File

@ -1,4 +1,4 @@
From b0a368f53e4f88a99b1b2bdbabc4815a501710d4 Mon Sep 17 00:00:00 2001
From 06701983001af96d02a1cc0ebf29b2d251d8d0bc Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Spigot Timings
@ -8,10 +8,10 @@ Adds performance tracking timings all around the Minecraft Server, and improves
Plugins can track their own timings with CustomTimingsHandler
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 1eaf92d..cc071c6 100644
index 2c43d9e..af5fe07 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -301,6 +301,7 @@ public final class Bukkit {
@@ -541,6 +541,7 @@ public final class Bukkit {
*/
public static void reload() {
server.reload();
@ -19,7 +19,7 @@ index 1eaf92d..cc071c6 100644
}
/**
@@ -747,4 +748,9 @@ public final class Bukkit {
@@ -1121,4 +1122,9 @@ public final class Bukkit {
public static UnsafeValues getUnsafe() {
return server.getUnsafe();
}
@ -30,10 +30,10 @@ index 1eaf92d..cc071c6 100644
+ }
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e14e9f1..573b33b 100644
index ab6d047..a57d506 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -916,4 +916,15 @@ public interface Server extends PluginMessageRecipient {
@@ -917,4 +917,15 @@ public interface Server extends PluginMessageRecipient {
*/
@Deprecated
UnsafeValues getUnsafe();
@ -50,7 +50,7 @@ index e14e9f1..573b33b 100644
+ Spigot spigot();
}
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index 87c33d9..31e4f66 100644
index e5fb0f8..e4c60ca 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -31,6 +31,7 @@ public abstract class Command {
@ -69,7 +69,7 @@ index 87c33d9..31e4f66 100644
}
/**
@@ -200,6 +202,7 @@ public abstract class Command {
@@ -207,6 +209,7 @@ public abstract class Command {
public boolean setLabel(String name) {
this.nextLabel = name;
if (!isRegistered()) {
@ -276,7 +276,7 @@ index d2fe422..1d51908 100644
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index fb0bfba..3e60a7b 100644
index 687029f..b081ecb 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -39,6 +39,7 @@ import org.bukkit.plugin.PluginLoader;
@ -295,7 +295,7 @@ index fb0bfba..3e60a7b 100644
/**
* This class was not meant to be constructed explicitly
@@ -284,13 +286,19 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -286,13 +288,19 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
@ -315,7 +315,7 @@ index fb0bfba..3e60a7b 100644
} catch (InvocationTargetException ex) {
throw new EventException(ex.getCause());
} catch (Throwable t) {
@@ -298,7 +306,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -300,7 +308,7 @@ public final class JavaPluginLoader implements PluginLoader {
}
}
};

2
Bukkit-Patches/0003-Add-PlayerItemDamageEvent.patch
View File

@ -1,4 +1,4 @@
From 22072de889e694efa2591459aa9ef70543589e52 Mon Sep 17 00:00:00 2001
From 35408cbfc22821fde7b03ef3b882586d594f63b1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:31:20 +1100
Subject: [PATCH] Add PlayerItemDamageEvent

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

@ -1,14 +1,14 @@
From ec36673732a8222bd6fdd768caa5cd10af0c9a8d Mon Sep 17 00:00:00 2001
From a8b2d4d00fef5ae934b8a868914942cc307152e1 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 fe8a0bd..e851b98 100644
index 229a71a..31526a3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1035,4 +1035,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1037,4 +1037,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @see Player#setHealthScaled(boolean)
*/
public double getHealthScale();
@ -33,7 +33,7 @@ index fe8a0bd..e851b98 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
index b74b7b8..081e994 100644
index 68834dd..4bc024f 100644
--- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
@@ -14,6 +14,7 @@ public class PlayerLoginEvent extends PlayerEvent {
@ -44,7 +44,7 @@ index b74b7b8..081e994 100644
/**
* @deprecated Address should be provided in other constructor
@@ -40,10 +41,17 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -43,10 +44,17 @@ public class PlayerLoginEvent extends PlayerEvent {
* @param address The address the player used to connect, provided for
* timing issues
*/
@ -63,7 +63,7 @@ index b74b7b8..081e994 100644
}
/**
@@ -52,7 +60,7 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -58,7 +66,7 @@ public class PlayerLoginEvent extends PlayerEvent {
*/
@Deprecated
public PlayerLoginEvent(final Player player, final Result result, final String message) {
@ -72,7 +72,7 @@ index b74b7b8..081e994 100644
}
/**
@@ -65,12 +73,23 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -71,12 +79,23 @@ public class PlayerLoginEvent extends PlayerEvent {
* @param result The result status for this event
* @param message The message to be displayed if result denies login
*/

2
Bukkit-Patches/0005-Add-Arrow-API.patch
View File

@ -1,4 +1,4 @@
From 49201e12ef4fa652371f467ab74a8d3fc97b8819 Mon Sep 17 00:00:00 2001
From b28fa0f7e5f1a12e31220211fdebefda5b2f9a39 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:08:24 +1000
Subject: [PATCH] Add Arrow API

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

@ -1,4 +1,4 @@
From 4e94c64d46706f12a51a9582248fc219e91ba5c9 Mon Sep 17 00:00:00 2001
From 793c5a6c9904fdaca5d3454d36cc4e21a95b3737 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
@ -271,10 +271,10 @@ index 2474a2d..37f29e2 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 9bf2c41..6cf3ff0 100644
index d306201..a909073 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1155,6 +1155,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1167,6 +1167,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean isGameRule(String rule);
@ -332,10 +332,10 @@ index 9bf2c41..6cf3ff0 100644
* Represents various map environment types that a world may be
*/
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index e851b98..c6bb787 100644
index 31526a3..0810c68 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1050,6 +1050,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1052,6 +1052,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

2
Bukkit-Patches/0007-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch
View File

@ -1,4 +1,4 @@
From e8e1da764520aaca81f71226b5ee28b2b03d6f56 Mon Sep 17 00:00:00 2001
From 1ddc82311725fbbc515d5c161781379f90bef9eb Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:01 -0500
Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent

2
Bukkit-Patches/0008-Entity-Mount-and-Dismount-Events.patch
View File

@ -1,4 +1,4 @@
From 4628c568a6f40da7af00dd0a408d742325b5bcd4 Mon Sep 17 00:00:00 2001
From 4db37abe6f0d9c33f0ded9db1103ab10221fb8b4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:53 +1000
Subject: [PATCH] Entity Mount and Dismount Events

2
Bukkit-Patches/0009-Update-Depends.patch
View File

@ -1,4 +1,4 @@
From 7b44571affe815589259e70786fb3073f827a9a1 Mon Sep 17 00:00:00 2001
From a1d01997d5b3c29406f889a50e6d1abe333ab56d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 4 Jul 2013 20:05:19 +1000
Subject: [PATCH] Update Depends

2
Bukkit-Patches/0010-InventoryClickEvent-getClickedInventory.patch
View File

@ -1,4 +1,4 @@
From 3d6ccae10dacffd2a1e1b88fc8684e91615491db Mon Sep 17 00:00:00 2001
From 2342cce8494165ce97322e3328362db7f5265037 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 7 Jul 2013 10:32:05 -0400
Subject: [PATCH] InventoryClickEvent getClickedInventory

2
Bukkit-Patches/0011-Added-getAllSessionData-to-the-Conversation-API.patch
View File

@ -1,4 +1,4 @@
From fcb2b26c3c2667fe9ace094a0f7761b94c8a2227 Mon Sep 17 00:00:00 2001
From 1ea7e8ad9ead0d6cd126387608c0543244b68a3d Mon Sep 17 00:00:00 2001
From: Alex Bennett <alex.eugene.bennett@gmail.com>
Date: Thu, 11 Jul 2013 15:31:32 -0500
Subject: [PATCH] Added getAllSessionData() to the Conversation API.

2
Bukkit-Patches/0012-Catch-Conversation-API-Errors.patch
View File

@ -1,4 +1,4 @@
From fb647ff8d9496446af81c8cc3c8b7601307f49e8 Mon Sep 17 00:00:00 2001
From bd775c3569e6cd82d7100a37d2f3c697fe879ab9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 22 Jul 2013 19:09:43 +1000
Subject: [PATCH] Catch Conversation API Errors

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

@ -1,14 +1,14 @@
From 4acd1068f9b97d884691f4ad67155fc12137d88b Mon Sep 17 00:00:00 2001
From e76c98d100815eea690734eb3d0e4fa766f51000 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 c6bb787..b879ecb 100644
index 0810c68..597bca1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1055,6 +1055,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1057,6 +1057,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

2
Bukkit-Patches/0014-Expand-Boolean-Prompt-Values.patch
View File

@ -1,4 +1,4 @@
From 087f69161489f86c83539227ce904da9083e2936 Mon Sep 17 00:00:00 2001
From 9f076ca35e20c23c3b897af47c987ed09915d116 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:42:16 +1000
Subject: [PATCH] Expand Boolean Prompt Values

6
Bukkit-Patches/0015-Add-Getter-for-Entity-Invulnerability.patch
View File

@ -1,14 +1,14 @@
From 67afcb6369ce63129febfee23b98af40eb087e9d Mon Sep 17 00:00:00 2001
From bacd16b4a31a5c592198e722a4840d375e414ab3 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 39c35c0..d1189ef 100644
index 9fa886f..dc1e5da 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -340,4 +340,22 @@ public interface Entity extends Metadatable {
@@ -341,4 +341,22 @@ public interface Entity extends Metadatable {
* @return if the custom name is displayed
*/
public boolean isCustomNameVisible();

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

@ -1,14 +1,14 @@
From bf72ae80438382daf8d9f521134cf179a7190737 Mon Sep 17 00:00:00 2001
From 2de6d85f734c7d63698348a23dcb1bf574882eb4 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 b879ecb..6559243 100644
index 597bca1..da4da7c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1076,6 +1076,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1078,6 +1078,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

2
Bukkit-Patches/0017-Fix-Plugin-Message-API-Disconnects.patch
View File

@ -1,4 +1,4 @@
From 0c34aae223d9c348e66229d0417ab1edc8c0aa0e Mon Sep 17 00:00:00 2001
From 12b7c52f44eefe1abc525c1075c83fca7e66107a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 19 Oct 2013 12:59:42 +1100
Subject: [PATCH] Fix Plugin Message API Disconnects

2
Bukkit-Patches/0018-Fix-Tab-Completion-for-Some-Commands.patch
View File

@ -1,4 +1,4 @@
From 349cd47d9d2c3106268c159fffc22ecb1f7c5cf4 Mon Sep 17 00:00:00 2001
From b21c6424ec427aad72d53accf9236ffe7eb812f5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 24 Dec 2013 10:14:25 +1100
Subject: [PATCH] Fix Tab Completion for Some Commands

2
Bukkit-Patches/0019-Add-Spigot-Links.patch
View File

@ -1,4 +1,4 @@
From 6e52589f3fd5a62af1f1d7ab5f3675c3abe2b44f Mon Sep 17 00:00:00 2001
From f3747d42f64987b41461b524c51ab17e19749ef9 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 23 Jan 2014 13:17:38 +1100
Subject: [PATCH] Add Spigot Links

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

@ -1,14 +1,14 @@
From 90d2cf3540f67d6c800368a956d7d30c26848d43 Mon Sep 17 00:00:00 2001
From 382384ef968b8eaef01afb523caa0d2c054f8e36 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 6559243..2cc19a7 100644
index da4da7c..57e6eae 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1084,6 +1084,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1086,6 +1086,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

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

@ -1,14 +1,14 @@
From fae0a406ff3f9fabd710b087a4f5832aa6d286e6 Mon Sep 17 00:00:00 2001
From 2185fb3d84d8548c4a880e86e8686d8dfcb8fed6 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 2cc19a7..37c8a58 100644
index 57e6eae..7ed0f6a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1094,6 +1094,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1096,6 +1096,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0022-Silenceable-Lightning-API.patch
View File

@ -1,14 +1,14 @@
From 5f2f41da4c36fb986e6983189c88a9d2724b2c2d Mon Sep 17 00:00:00 2001
From 068c3416cfb2542f94308893bfe6932f01870acb 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 6cf3ff0..ab73174 100644
index a909073..fd399d3 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1200,6 +1200,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1212,6 +1212,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
{
throw new UnsupportedOperationException( "Not supported yet." );
}

47
Bukkit-Patches/0023-Remove-deprecation-on-some-player-lookup-methods.patch
View File

@ -1,4 +1,4 @@
From 2e00384fb6d1ad3049d6b0cab07b128c4d7892f1 Mon Sep 17 00:00:00 2001
From 3a749aa1121dff4ead2d7eed05e89f15bb76c5ab Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 30 Mar 2014 15:58:22 +1100
Subject: [PATCH] Remove deprecation on some player lookup methods
@ -6,35 +6,50 @@ Subject: [PATCH] Remove deprecation on some player lookup methods
Most of these methods still have plenty of use given that only one player with each name can exist at a time. Deprecating these methods renders even basic functionality such as /msg <name> impossible without causing compiler warnings. We will maintain this API and it should be considered safe and appropriate for most use cases.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index cc071c6..b85a699 100644
index af5fe07..2ab17db 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -197,7 +197,6 @@ public final class Bukkit {
/**
* @see Server#getPlayer(String name)
@@ -372,12 +372,9 @@ public final class Bukkit {
* <p>
* This method may not return objects for offline players.
*
- * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer
- * guaranteed to be unique
* @param name the name to look up
* @return a player if one was found, null otherwise
*/
- @Deprecated
public static Player getPlayer(String name) {
return server.getPlayer(name);
}
@@ -205,7 +204,6 @@ public final class Bukkit {
@@ -385,12 +382,9 @@ public final class Bukkit {
/**
* @see Server#matchPlayer(String name)
*/
- @Deprecated
public static List<Player> matchPlayer(String name) {
return server.matchPlayer(name);
}
@@ -448,7 +446,6 @@ public final class Bukkit {
/**
* @see Server#getPlayerExact(String name)
* Gets the player with the exact given name, case insensitive.
*
- * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer
- * guaranteed to be unique
* @param name Exact name of the player to retrieve
* @return a player object if one was found, null otherwise
*/
- @Deprecated
public static Player getPlayerExact(String name) {
return server.getPlayerExact(name);
}
@@ -402,12 +396,9 @@ public final class Bukkit {
* This list is not sorted in any particular order. If an exact match is
* found, the returned list will only contain a single result.
*
- * @deprecated Use {@link #getPlayer(UUID)} as player names are no longer
- * guaranteed to be unique
* @param name the (partial) name to match
* @return list of all possible players
*/
- @Deprecated
public static List<Player> matchPlayer(String name) {
return server.matchPlayer(name);
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 573b33b..f861214 100644
index a57d506..57b2794 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -308,23 +308,17 @@ public interface Server extends PluginMessageRecipient {

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

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

2
Bukkit-Patches/0025-Add-Score.isScoreSet-Z-API.patch
View File

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

2
Bukkit-Patches/0026-Add-PlayerSpawnLocationEvent.patch
View File

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

4
Bukkit-Patches/0027-Ease-ClassLoader-Deadlocks-Where-Possible.patch
View File

@ -1,4 +1,4 @@
From a1f943c6a96039f0c32d66840c7733d34eab815f Mon Sep 17 00:00:00 2001
From 7b22f91f252d08fdad9c53a669f51356fb34db71 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 16 Jul 2014 17:24:21 +1000
Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible
@ -6,7 +6,7 @@ Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible
When on Java 7 we can register the classloader as parallel capable to prevent deadlocks caused by certain scenarios. Due to the nature of PluginClassLoader this isn't completely safe, but we can make it safer by switching to concurrency focused collections. Either way this is far better than crashing the server.
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 3e60a7b..5a57379 100644
index b081ecb..0ac8325 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -48,7 +48,7 @@ import org.yaml.snakeyaml.error.YAMLException;

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

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

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

@ -1,14 +1,14 @@
From 31ac5fc27218ece6f6ae7f493bf8aede012c72ca Mon Sep 17 00:00:00 2001
From f8e416af1d4903c5086910c7325987dfaac2d619 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 37c8a58..b2ad5b7 100644
index 7ed0f6a..b55d70e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -333,10 +333,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -334,10 +334,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Forces an update of the player's entire inventory.
*

4
Bukkit-Patches/0030-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
View File

@ -1,11 +1,11 @@
From 061fe4dee6e1a5f670bf8fb4d522fd46c81e2786 Mon Sep 17 00:00:00 2001
From 203a3470d214613a5d1f979290dfc71c308f9596 Mon Sep 17 00:00:00 2001
From: libraryaddict <redwarfare@live.com>
Date: Fri, 22 Aug 2014 05:31:04 -0400
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta
diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
index 397ba11..9ae3e4c 100644
index 00f71ce..d560bb2 100644
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
@@ -124,6 +124,34 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable {

28
Bukkit-Patches/0031-Skip-loading-of-plugins-which-are-not-1.8-compatible.patch
View File

@ -1,28 +0,0 @@
From 83e927d3f63812b935f753935940351b16b9ba34 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 1 Sep 2014 19:36:20 +1000
Subject: [PATCH] Skip loading of plugins which are not 1.8 compatible.
As they do not work with Spigot 1.8 builds!
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 1d51908..b3002e8 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -132,6 +132,13 @@ public final class SimplePluginManager implements PluginManager {
try {
description = loader.getPluginDescription(file);
String name = description.getName();
+ // Spigot Start
+ if ( name.equalsIgnoreCase( "Orebfuscator" ) )
+ {
+ server.getLogger().log( Level.WARNING, "Skipping loading of Orebfuscator as it does not work with Spigot 1.8 builds!" );
+ continue;
+ }
+ // Spigot End
if (name.equalsIgnoreCase("bukkit") || name.equalsIgnoreCase("minecraft") || name.equalsIgnoreCase("mojang")) {
server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "': Restricted Name");
continue;
--
2.1.0

2
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From a648a0a8b0e53cc753bb37b9a34e7fee8600a977 Mon Sep 17 00:00:00 2001
From 34268f62473dec95944b065b2d62e82aab2a2464 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes

2
CraftBukkit-Patches/0002-mc-dev-imports.patch
View File

@ -1,4 +1,4 @@
From fef5885eb9ba89075b623d31b95da768e078aa0c Mon Sep 17 00:00:00 2001
From aaca00016118455bba4debef407285ea185d2695 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 15:10:48 +1100
Subject: [PATCH] mc-dev imports

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

@ -1,4 +1,4 @@
From 4f493e30fb31c21faae3c325034835f25752e915 Mon Sep 17 00:00:00 2001
From eccaca086e9cc6a04bb6469e0f3ec167f9121fee 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 f2a78c1..c20a2d5 100644
index fa1fe20..fb21e5b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1620,4 +1620,14 @@ public final class CraftServer implements Server {
@@ -1625,4 +1625,14 @@ public final class CraftServer implements Server {
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}
@ -104,7 +104,7 @@ index 64e346d..243e8e5 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 286a58c..fb07b7d 100644
index 0f0e160..acd6a34 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1309,4 +1309,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
CraftBukkit-Patches/0004-Obfuscation-Helpers.patch
View File

@ -1,4 +1,4 @@
From 930d80ace4fb089739b570ddcd2bc247281aa2b4 Mon Sep 17 00:00:00 2001
From 29a756575eaff194e5a3759084883c683ab1d4e6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 14 Apr 2014 10:38:04 +1000
Subject: [PATCH] Obfuscation Helpers
@ -6,7 +6,7 @@ Subject: [PATCH] Obfuscation Helpers
Provides several friendly named methods which map to a obfuscated method. Obfuscated methods which are used frequently should be added to this file to ease with updates to new Minecraft versions.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c12b192..586123c 100644
index 2422a5f..7224ee6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1298,6 +1298,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs

10
CraftBukkit-Patches/0005-Spigot-Configuration.patch
View File

@ -1,4 +1,4 @@
From 281c065d2ecfa8d09a07ca862d585ef02ae2ea7c Mon Sep 17 00:00:00 2001
From cba0ed7de061f5e3becddd0f9db58437454371c7 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@ -35,10 +35,10 @@ index 29c0a34..424b71d 100644
if (!this.getOnlineMode()) {
DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0767445..94463a4 100644
index f45bf54..130c54d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -85,6 +85,7 @@ public abstract class World implements IBlockAccess {
@@ -98,6 +98,7 @@ public abstract class World implements IBlockAccess {
public long ticksPerMonsterSpawns;
public boolean populating;
private int tickPosition;
@ -46,7 +46,7 @@ index 0767445..94463a4 100644
public CraftWorld getWorld() {
return this.world;
@@ -99,6 +100,7 @@ public abstract class World implements IBlockAccess {
@@ -112,6 +113,7 @@ public abstract class World implements IBlockAccess {
}
protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) {
@ -55,7 +55,7 @@ index 0767445..94463a4 100644
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c20a2d5..ff9efe9 100644
index fb21e5b..50a44f4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -245,8 +245,10 @@ public final class CraftServer implements Server {

10
CraftBukkit-Patches/0006-Better-Chunk-Tick-Selection.patch
View File

@ -1,4 +1,4 @@
From 62ad744472fdb9885c06d58f0ef5a47652b88d50 Mon Sep 17 00:00:00 2001
From 0b4a7be15ef20fd9da2461d422aa8375d8916185 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:56:02 +1000
Subject: [PATCH] Better Chunk Tick Selection
@ -6,7 +6,7 @@ Subject: [PATCH] Better Chunk Tick Selection
An optimized chunk ticking algorithm which better selects chunks around players which are active on the server.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 94463a4..a01da14 100644
index 130c54d..9a218e4 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -64,7 +64,7 @@ public abstract class World implements IBlockAccess {
@ -18,7 +18,7 @@ index 94463a4..a01da14 100644
private int K;
public boolean allowMonsters;
public boolean allowAnimals;
@@ -85,6 +85,31 @@ public abstract class World implements IBlockAccess {
@@ -98,6 +98,31 @@ public abstract class World implements IBlockAccess {
public long ticksPerMonsterSpawns;
public boolean populating;
private int tickPosition;
@ -50,7 +50,7 @@ index 94463a4..a01da14 100644
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
public CraftWorld getWorld() {
@@ -106,6 +131,11 @@ public abstract class World implements IBlockAccess {
@@ -119,6 +144,11 @@ public abstract class World implements IBlockAccess {
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); // CraftBukkit
// CraftBukkit end
@ -62,7 +62,7 @@ index 94463a4..a01da14 100644
this.K = this.random.nextInt(12000);
this.allowMonsters = true;
@@ -1884,17 +1914,44 @@ public abstract class World implements IBlockAccess {
@@ -1897,17 +1927,44 @@ public abstract class World implements IBlockAccess {
int k;
int l;

2
CraftBukkit-Patches/0007-Crop-Growth-Rates.patch
View File

@ -1,4 +1,4 @@
From 9a1a0d43423b68c8c3a2e36b44d4a4aa47b3b866 Mon Sep 17 00:00:00 2001
From 46825f35d92e4d5d2075470c0c17005e35ca6b13 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:17:20 +1000
Subject: [PATCH] Crop Growth Rates

4
CraftBukkit-Patches/0008-More-Efficient-Chunk-Save-Queue.patch
View File

@ -1,4 +1,4 @@
From 6d0c5cae337957d4c1b3d8b5ff8eb01385433532 Mon Sep 17 00:00:00 2001
From 0c6626c35833657924083433faabd8d7279dce79 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:09:45 +1000
Subject: [PATCH] More Efficient Chunk Save Queue
@ -6,7 +6,7 @@ Subject: [PATCH] More Efficient Chunk Save Queue
Optimizes the data structures behind the chunk save queue into ones more suitable for the type of data and access which they are used for.
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index a5175fd..9ab0b5e 100644
index 527ab42..33bb889 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -15,8 +15,11 @@ import org.apache.logging.log4j.Logger;

6
CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch
View File

@ -1,4 +1,4 @@
From e9147b159cf2d57870d56030b3f0a9c7f803f3fa Mon Sep 17 00:00:00 2001
From 7d95080c00f83f2c05ca97cb44c43ce0d867c5c1 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
@ -41,10 +41,10 @@ index e2c0712..7f16401 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index a01da14..4cd59aa 100644
index 9a218e4..6b53f5b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -908,6 +908,23 @@ public abstract class World implements IBlockAccess {
@@ -921,6 +921,23 @@ public abstract class World implements IBlockAccess {
// Not all projectiles extend EntityProjectile, so check for Bukkit interface instead
event = CraftEventFactory.callProjectileLaunchEvent(entity);
}

12
CraftBukkit-Patches/0010-Async-Operation-Catching.patch
View File

@ -1,4 +1,4 @@
From 9e5facb25e4f5cd1aefa2709f65a6b3b54f69f12 Mon Sep 17 00:00:00 2001
From bf458c840cda852fece98340e8529e55cf21cb3b 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
@ -66,10 +66,10 @@ index 7c58740..f5d518f 100644
this.trackedPlayers.remove(entityplayer);
entityplayer.d(this.tracker);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4cd59aa..a16be9b 100644
index 6b53f5b..69e78b8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -878,6 +878,7 @@ public abstract class World implements IBlockAccess {
@@ -891,6 +891,7 @@ public abstract class World implements IBlockAccess {
}
public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
@ -77,7 +77,7 @@ index 4cd59aa..a16be9b 100644
if (entity == null) return false;
// CraftBukkit end
int i = MathHelper.floor(entity.locX / 16.0D);
@@ -985,6 +986,7 @@ public abstract class World implements IBlockAccess {
@@ -998,6 +999,7 @@ public abstract class World implements IBlockAccess {
}
public void removeEntity(Entity entity) {
@ -85,7 +85,7 @@ index 4cd59aa..a16be9b 100644
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
@@ -2410,6 +2412,7 @@ public abstract class World implements IBlockAccess {
@@ -2423,6 +2425,7 @@ public abstract class World implements IBlockAccess {
}
public void b(Collection collection) {
@ -122,7 +122,7 @@ index 17d24ce..a45f2a3 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 fb07b7d..01b1822 100644
index acd6a34..a0df1d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
CraftBukkit-Patches/0011-View-Distance.patch
View File

@ -1,4 +1,4 @@
From 5ade27e51b2ffa3362e42dfba15d1b40a28847a9 Mon Sep 17 00:00:00 2001
From 2d77781735f24206efabc85b2686de7ffe8ee94b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance

62
CraftBukkit-Patches/0012-Spigot-Timings.patch
View File

@ -1,4 +1,4 @@
From 0ebc78268112f256eabea7219e1bd2921fd2b3a8 Mon Sep 17 00:00:00 2001
From 4e94a503c9de92d30489655ea3affe5c577459ec 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
@ -56,7 +56,7 @@ index a363af7..9ee7e75 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 9ab0b5e..1eea51c 100644
index 33bb889..7caddb5 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -45,7 +45,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -69,7 +69,7 @@ index 9ab0b5e..1eea51c 100644
if (data != null) {
Chunk chunk = (Chunk) data[0];
NBTTagCompound nbttagcompound = (NBTTagCompound) data[1];
@@ -381,6 +383,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -400,6 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) {
// CraftBukkit end
@ -77,7 +77,7 @@ index 9ab0b5e..1eea51c 100644
NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10);
if (nbttaglist1 != null) {
@@ -406,7 +409,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -425,7 +428,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
}
@ -87,7 +87,7 @@ index 9ab0b5e..1eea51c 100644
NBTTagList nbttaglist2 = nbttagcompound.getList("TileEntities", 10);
if (nbttaglist2 != null) {
@@ -419,6 +423,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -438,6 +442,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
}
@ -96,7 +96,7 @@ index 9ab0b5e..1eea51c 100644
if (nbttagcompound.hasKeyOfType("TileTicks", 9)) {
NBTTagList nbttaglist3 = nbttagcompound.getList("TileTicks", 10);
@@ -438,6 +444,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -457,6 +463,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
}
@ -242,7 +242,7 @@ index 0aaee5f..803b5df 100644
this.world.methodProfiler.b();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 586123c..ab31862 100644
index 7224ee6..7d3b218 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -45,6 +45,7 @@ import joptsimple.OptionSet;
@ -253,7 +253,7 @@ index 586123c..ab31862 100644
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
import org.bukkit.event.world.WorldSaveEvent;
@@ -587,6 +588,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -589,6 +590,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
protected void x() {}
protected void y() throws ExceptionWorldConflict { // CraftBukkit - added throws
@ -261,7 +261,7 @@ index 586123c..ab31862 100644
long i = System.nanoTime();
++this.ticks;
@@ -613,10 +615,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -615,10 +617,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
}
if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@ -274,7 +274,7 @@ index 586123c..ab31862 100644
}
this.methodProfiler.a("tallying");
@@ -633,6 +637,8 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -635,6 +639,8 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.methodProfiler.b();
this.methodProfiler.b();
@ -283,7 +283,7 @@ index 586123c..ab31862 100644
}
public void z() {
@@ -651,16 +657,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -653,16 +659,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.methodProfiler.c("levels");
@ -307,7 +307,7 @@ index 586123c..ab31862 100644
// Send time updates to everyone, it will get the right time from the world the player is in.
if (this.ticks % 20 == 0) {
for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
@@ -668,6 +681,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -670,6 +683,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time
}
}
@ -315,7 +315,7 @@ index 586123c..ab31862 100644
int i;
@@ -691,7 +705,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -693,7 +707,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
CrashReport crashreport;
try {
@ -325,7 +325,7 @@ index 586123c..ab31862 100644
} catch (Throwable throwable1) {
crashreport = CrashReport.a(throwable1, "Exception ticking world");
worldserver.a(crashreport);
@@ -699,7 +715,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -701,7 +717,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
}
try {
@ -335,7 +335,7 @@ index 586123c..ab31862 100644
} catch (Throwable throwable2) {
crashreport = CrashReport.a(throwable2, "Exception ticking world entities");
worldserver.a(crashreport);
@@ -708,7 +726,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -710,7 +728,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.methodProfiler.b();
this.methodProfiler.a("tracker");
@ -345,7 +345,7 @@ index 586123c..ab31862 100644
this.methodProfiler.b();
this.methodProfiler.b();
// } // CraftBukkit
@@ -717,14 +737,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -719,14 +739,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
}
this.methodProfiler.c("connection");
@ -367,7 +367,7 @@ index 586123c..ab31862 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 9c7c2bd..47ecfdd 100644
index 17c5e38..c7d4f9f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1009,6 +1009,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@ -420,7 +420,7 @@ index ec76148..a93ad27 100644
private static Map f = Maps.newHashMap();
private static Map g = Maps.newHashMap();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index a16be9b..5fc707f 100644
index 69e78b8..d67f2eb 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,6 +18,7 @@ import org.bukkit.Bukkit;
@ -431,7 +431,7 @@ index a16be9b..5fc707f 100644
import org.bukkit.generator.ChunkGenerator;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
@@ -112,6 +113,8 @@ public abstract class World implements IBlockAccess {
@@ -125,6 +126,8 @@ public abstract class World implements IBlockAccess {
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
@ -440,7 +440,7 @@ index a16be9b..5fc707f 100644
public CraftWorld getWorld() {
return this.world;
}
@@ -149,6 +152,7 @@ public abstract class World implements IBlockAccess {
@@ -162,6 +165,7 @@ public abstract class World implements IBlockAccess {
this.M = worldprovider.getWorldBorder();
this.getServer().addWorld(this.world); // CraftBukkit
@ -448,7 +448,7 @@ index a16be9b..5fc707f 100644
}
public World b() {
@@ -1239,6 +1243,7 @@ public abstract class World implements IBlockAccess {
@@ -1252,6 +1256,7 @@ public abstract class World implements IBlockAccess {
this.g.clear();
this.methodProfiler.c("regular");
@ -456,7 +456,7 @@ index a16be9b..5fc707f 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);
@@ -1255,7 +1260,9 @@ public abstract class World implements IBlockAccess {
@@ -1268,7 +1273,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.a("tick");
if (!entity.dead) {
try {
@ -466,7 +466,7 @@ index a16be9b..5fc707f 100644
} catch (Throwable throwable1) {
crashreport = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails = crashreport.a("Entity being ticked");
@@ -1280,7 +1287,9 @@ public abstract class World implements IBlockAccess {
@@ -1293,7 +1300,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.b();
}
@ -476,7 +476,7 @@ index a16be9b..5fc707f 100644
this.L = true;
// CraftBukkit start - From below, clean up tile entities before ticking them
if (!this.b.isEmpty()) {
@@ -1300,6 +1309,7 @@ public abstract class World implements IBlockAccess {
@@ -1313,6 +1322,7 @@ public abstract class World implements IBlockAccess {
if (this.isLoaded(blockposition) && this.M.a(blockposition)) {
try {
@ -484,7 +484,7 @@ index a16be9b..5fc707f 100644
((IUpdatePlayerListBox) tileentity).c();
} catch (Throwable throwable2) {
CrashReport crashreport1 = CrashReport.a(throwable2, "Ticking block entity");
@@ -1308,6 +1318,11 @@ public abstract class World implements IBlockAccess {
@@ -1321,6 +1331,11 @@ public abstract class World implements IBlockAccess {
tileentity.a(crashreportsystemdetails1);
throw new ReportedException(crashreport1);
}
@ -496,7 +496,7 @@ index a16be9b..5fc707f 100644
}
}
@@ -1320,6 +1335,8 @@ public abstract class World implements IBlockAccess {
@@ -1333,6 +1348,8 @@ public abstract class World implements IBlockAccess {
}
}
@ -505,7 +505,7 @@ index a16be9b..5fc707f 100644
this.L = false;
/* CraftBukkit start - Moved up
if (!this.b.isEmpty()) {
@@ -1352,6 +1369,7 @@ public abstract class World implements IBlockAccess {
@@ -1365,6 +1382,7 @@ public abstract class World implements IBlockAccess {
this.a.clear();
}
@ -513,7 +513,7 @@ index a16be9b..5fc707f 100644
this.methodProfiler.b();
this.methodProfiler.b();
}
@@ -1396,6 +1414,7 @@ public abstract class World implements IBlockAccess {
@@ -1409,6 +1427,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) */) {
@ -521,7 +521,7 @@ index a16be9b..5fc707f 100644
// CraftBukkit end
entity.P = entity.locX;
entity.Q = entity.locY;
@@ -1459,6 +1478,7 @@ public abstract class World implements IBlockAccess {
@@ -1472,6 +1491,7 @@ public abstract class World implements IBlockAccess {
}
}
@ -584,10 +584,10 @@ index f34b76e..9012c9e 100644
public BiomeMeta a(EnumCreatureType enumcreaturetype, BlockPosition blockposition) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ff9efe9..0d23ec1 100644
index 50a44f4..9d3d76e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1630,6 +1630,11 @@ public final class CraftServer implements Server {
@@ -1635,6 +1635,11 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{

2
CraftBukkit-Patches/0013-Fix-Mob-Spawning-Relative-to-View-Distance.patch
View File

@ -1,4 +1,4 @@
From bc6052de701c26b98da0e84539c029dfadd6b153 Mon Sep 17 00:00:00 2001
From b9b5a6c0add6253d7f4d79849542708bf3bc18c0 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

6
CraftBukkit-Patches/0014-Handle-Null-Tile-Entities.patch
View File

@ -1,14 +1,14 @@
From 0c10eb34353da6d37510534f7747584e8b45d470 Mon Sep 17 00:00:00 2001
From 7e74340c7f79f3945ef71669e7366b33e5e632db 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 5fc707f..974daf4 100644
index d67f2eb..9cb7ab8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1303,6 +1303,13 @@ public abstract class World implements IBlockAccess {
@@ -1316,6 +1316,13 @@ public abstract class World implements IBlockAccess {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();

8
CraftBukkit-Patches/0015-Entity-Activation-Range.patch
View File

@ -1,4 +1,4 @@
From f1ac20811c2a33c2149c56883af5fabb560fa65c Mon Sep 17 00:00:00 2001
From af62d64b9a60038edfe602295049b4c11baf40a1 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
@ -155,10 +155,10 @@ index 803b5df..86474de 100644
public void G() {
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 974daf4..076b4fc 100644
index 9cb7ab8..aa6d407 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1243,6 +1243,7 @@ public abstract class World implements IBlockAccess {
@@ -1256,6 +1256,7 @@ public abstract class World implements IBlockAccess {
this.g.clear();
this.methodProfiler.c("regular");
@ -166,7 +166,7 @@ index 974daf4..076b4fc 100644
timings.entityTick.startTiming(); // Spigot
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
@@ -1418,9 +1419,11 @@ public abstract class World implements IBlockAccess {
@@ -1431,9 +1432,11 @@ public abstract class World implements IBlockAccess {
int j = MathHelper.floor(entity.locZ);
byte b0 = 32;

2
CraftBukkit-Patches/0016-Metrics.patch
View File

@ -1,4 +1,4 @@
From 74c8d363f218b601d7059aa9cbc546f9da0c0db9 Mon Sep 17 00:00:00 2001
From 4787b7b00753364412d162f25dfadbe1da207c55 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 08:58:35 +1100
Subject: [PATCH] Metrics

2
CraftBukkit-Patches/0017-PlayerItemDamageEvent.patch
View File

@ -1,4 +1,4 @@
From cb6f24f19cbd3a6f2a337b8228d32b749bc7216e Mon Sep 17 00:00:00 2001
From 7c574b4c66f3561cbfc8cfab2d5e40c8d6a595e1 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

2
CraftBukkit-Patches/0018-Prevent-NPE-in-CraftSign.patch
View File

@ -1,4 +1,4 @@
From a2ee07d7ddf431e275dec7fb6279daf63433aeb7 Mon Sep 17 00:00:00 2001
From 5bc259a6567c04944c072dd5866eb94606b34741 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 18 Mar 2013 20:01:44 +1100
Subject: [PATCH] Prevent NPE in CraftSign

2
CraftBukkit-Patches/0019-Entity-Tracking-Ranges.patch
View File

@ -1,4 +1,4 @@
From 5933e32258ce700258244a95c28a6e1e3f3ad89d Mon Sep 17 00:00:00 2001
From 255ca1791eb25f3ae3dc98a48cdebe11e6437c48 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Feb 2013 11:58:47 -0500
Subject: [PATCH] Entity Tracking Ranges

2
CraftBukkit-Patches/0020-Thread-Naming-and-Tweaks.patch
View File

@ -1,4 +1,4 @@
From fbba0bd76ebbcd4d2ba2ecafd0e91f1a040095d6 Mon Sep 17 00:00:00 2001
From 8fe787a19b0fd8fea847c4bec826f8be60af91a7 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 23 Apr 2013 11:50:27 +1000
Subject: [PATCH] Thread Naming and Tweaks

6
CraftBukkit-Patches/0021-Close-Unloaded-Save-Files.patch
View File

@ -1,4 +1,4 @@
From 75800d61cf22442d4d1bc93c1f236af83a4d4998 Mon Sep 17 00:00:00 2001
From e95361cd8ad19c073e62e7f7048a4616bdd65708 Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Wed, 27 Mar 2013 01:41:54 +0200
Subject: [PATCH] Close Unloaded Save Files
@ -18,10 +18,10 @@ index f4f72ef..1b03878 100644
public static synchronized RegionFile a(File file, int i, int j) {
File file1 = new File(file, "region");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0d23ec1..2da23eb 100644
index 9d3d76e..ff06c34 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -945,6 +945,31 @@ public final class CraftServer implements Server {
@@ -950,6 +950,31 @@ public final class CraftServer implements Server {
worlds.remove(world.getName().toLowerCase());
console.worlds.remove(console.worlds.indexOf(handle));

2
CraftBukkit-Patches/0022-Remove-o-Option.patch
View File

@ -1,4 +1,4 @@
From a47d75e84a1dc350dd415a8c5db259cfa328c253 Mon Sep 17 00:00:00 2001
From 173a71adcf42c8dc373c9a2399eb4a0410915efc Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 19 May 2013 18:29:48 +1000
Subject: [PATCH] Remove -o Option

2
CraftBukkit-Patches/0023-Recipe-Deconstruction.patch
View File

@ -1,4 +1,4 @@
From c1f5c0814bd607378cbbefe75da2700a888106ee Mon Sep 17 00:00:00 2001
From e62dd23291bb93bbfa318a7fcb14265d515e77b9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 1 Jun 2013 16:34:38 +1000
Subject: [PATCH] Recipe Deconstruction

2
CraftBukkit-Patches/0024-Implement-Arrow-API.patch
View File

@ -1,4 +1,4 @@
From 8e4326ea42b4006f8f38bd9f3023560dfe9f7a55 Mon Sep 17 00:00:00 2001
From 6f2d10b520824fb018ee8d27022b0e47f9fc5c4c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:16:05 +1000
Subject: [PATCH] Implement Arrow API

2
CraftBukkit-Patches/0025-Hopper-Customisations.patch
View File

@ -1,4 +1,4 @@
From 6e47263580456c9da8b556515c903cbfbbdf8c88 Mon Sep 17 00:00:00 2001
From d446a15e50696cb19528308e5a7f0f8b95fde33d Mon Sep 17 00:00:00 2001
From: erocs <github@erocs.org>
Date: Sun, 8 Sep 2013 12:06:15 -0700
Subject: [PATCH] Hopper Customisations

2
CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch
View File

@ -1,4 +1,4 @@
From d0f19a283206f07de4ce8eaa985ad0a9a38d3b2f Mon Sep 17 00:00:00 2001
From d6637fb358b0354ead60a507e50010e09cfcb348 Mon Sep 17 00:00:00 2001
From: Andy Shulman <andy.shulman@hotmail.com>
Date: Mon, 15 Apr 2013 20:06:37 -0500
Subject: [PATCH] Implement SpawnerSpawnEvent.

2
CraftBukkit-Patches/0027-Firework-Meta-Crash-Fix.patch
View File

@ -1,4 +1,4 @@
From 72b3a001f6613cdfd324897004a0c3a2ea87d95a Mon Sep 17 00:00:00 2001
From 6bf639a2025d60282de7a822ba0bf148f71dd59a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 15 Jun 2013 21:34:48 +1000
Subject: [PATCH] Firework Meta Crash Fix

4
CraftBukkit-Patches/0028-Allow-Disabling-of-Command-Logging.patch
View File

@ -1,11 +1,11 @@
From b2a198ade17a9e1d3f8afdf16efd2d308a204398 Mon Sep 17 00:00:00 2001
From 7efe54f5803c0ccec23d7b5da399a23080cd8efc 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 47ecfdd..e21bed0 100644
index c7d4f9f..1160b6e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1012,6 +1012,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

6
CraftBukkit-Patches/0029-Allow-Disabling-of-Command-TabComplete.patch
View File

@ -1,14 +1,14 @@
From 3219a5db66508a6996bd785c66421f7446214209 Mon Sep 17 00:00:00 2001
From 938bb2bbecbdca581826bcc17c4611890027e65f 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/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2da23eb..463c0d8 100644
index ff06c34..f9f5056 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1549,6 +1549,13 @@ public final class CraftServer implements Server {
@@ -1554,6 +1554,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message) {

4
CraftBukkit-Patches/0030-Configurable-Messages.patch
View File

@ -1,4 +1,4 @@
From 81b044be2a6583f986e9c9d0f08ef51a57883e66 Mon Sep 17 00:00:00 2001
From ba993a3c58235d8d8b949adb280788cafe9880e1 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
@ -45,7 +45,7 @@ index 5e882cc..2b8a3e5 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 463c0d8..0741d7b 100644
index f9f5056..537932a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -626,11 +626,7 @@ public final class CraftServer implements Server {

6
CraftBukkit-Patches/0031-Allow-Disabling-of-Random-Lighting-Updates.patch
View File

@ -1,4 +1,4 @@
From 0945d83063d51846a2cd6b8043c59baa3c6abff0 Mon Sep 17 00:00:00 2001
From db55ab7f90f09b34ed44ccc65d553e62a764433c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates
@ -18,10 +18,10 @@ index c3059b6..9e9ea23 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 076b4fc..9b4e05a 100644
index aa6d407..7c058fc 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2009,7 +2009,7 @@ public abstract class World implements IBlockAccess {
@@ -2022,7 +2022,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.a("playerCheckLight");

2
CraftBukkit-Patches/0032-Properly-Close-Inventories.patch
View File

@ -1,4 +1,4 @@
From db18a4785b18daf00b86c88fd4dc0d32eebb5df3 Mon Sep 17 00:00:00 2001
From 86bf7d4be1de5bc6ede793017ce722684427e1ea 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
CraftBukkit-Patches/0033-Disallow-Interaction-With-Self.patch
View File

@ -1,14 +1,14 @@
From c7e3163a08a3797e61608ac9fcbbdf5ebfd34ba2 Mon Sep 17 00:00:00 2001
From 148863cb57e94a6063ffaeebd8c321f8807d01dc 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 e21bed0..2bf9f49 100644
index 1160b6e..5e5e6ba 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1147,6 +1147,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -1146,6 +1146,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.u());
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);

2
CraftBukkit-Patches/0034-Entity-Mount-and-Dismount-Events.patch
View File

@ -1,4 +1,4 @@
From 39908f7095fd34b8ce478c42808bd83747fcafcc Mon Sep 17 00:00:00 2001
From 2b8bc08ea51b342aeb3715295abe0373d91e0a40 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 20:32:49 +1000
Subject: [PATCH] Entity Mount and Dismount Events

2
CraftBukkit-Patches/0035-Prevent-Ghost-Players-Caused-by-Plugins.patch
View File

@ -1,4 +1,4 @@
From d2347b2bad3317dcd6774c60255af50c18ffbf49 Mon Sep 17 00:00:00 2001
From 39457860e637dd33e23a801f73808afb4f62a496 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

2
CraftBukkit-Patches/0036-Plug-World-Unload-Memory-Leak.patch
View File

@ -1,4 +1,4 @@
From cb4abf0876742f68cb52fa57d0f05eef21de148f Mon Sep 17 00:00:00 2001
From 98ae2b148bb59c9af8619cfcf7f592864ca90645 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:02:59 +1000
Subject: [PATCH] Plug World Unload Memory Leak

8
CraftBukkit-Patches/0037-Player-Collision-API.patch
View File

@ -1,11 +1,11 @@
From 34960664e3295fc6a2dde8148d5984d185fda497 Mon Sep 17 00:00:00 2001
From 9c7a158367c21ce04eab04c353170509b4a01534 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 7c47e5b..6e9354f 100644
index 7635555..87356e4 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -425,6 +425,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -38,7 +38,7 @@ index 86474de..6358f5e 100644
Entity entity = (Entity) list.get(i);
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index dc7654a..3bc77ae 100644
index 8d0fc36..d8c8151 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -62,6 +62,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -64,7 +64,7 @@ index dc7654a..3bc77ae 100644
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
super(worldserver, gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 01b1822..984bea1 100644
index a0df1d2..88c45f1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1314,6 +1314,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

6
CraftBukkit-Patches/0038-Fully-Disable-Snooper-When-Not-Required.patch
View File

@ -1,14 +1,14 @@
From 900e9db269b400872ce1388c48c21879deeb0ebf Mon Sep 17 00:00:00 2001
From 6627cc2177ad9e1991e1c595c894e5b441dce6f9 Mon Sep 17 00:00:00 2001
From: agentk20 <agentkid20@gmail.com>
Date: Sat, 3 Aug 2013 19:28:48 +1000
Subject: [PATCH] Fully Disable Snooper When Not Required
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ab31862..1d67c07 100644
index 7d3b218..2c39a80 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -627,11 +627,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -629,11 +629,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.g[this.ticks % 100] = System.nanoTime() - i;
this.methodProfiler.b();
this.methodProfiler.a("snooper");

2
CraftBukkit-Patches/0039-Add-Getter-for-Entity-Invulnerability.patch
View File

@ -1,4 +1,4 @@
From 680b66ad471af5c09814c9c3495f6eb10e779fad Mon Sep 17 00:00:00 2001
From 78d9aa55fcc0bc2b2184e739d98d161933be842d 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

4
CraftBukkit-Patches/0040-Cap-Minimum-Player-Speed.patch
View File

@ -1,11 +1,11 @@
From caacb61f2c1776f5d877fff024bab374ddf178f0 Mon Sep 17 00:00:00 2001
From 474b8e425e75d6931365c37f04a04adecc5df970 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 5 Aug 2013 20:17:20 +1000
Subject: [PATCH] Cap Minimum Player Speed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 984bea1..bf9dd99 100644
index 88c45f1..6bdf188 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1178,7 +1178,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
CraftBukkit-Patches/0041-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch
View File

@ -1,11 +1,11 @@
From e410f14442e2f20e4e6e8e0359a3fb4a22389c0e Mon Sep 17 00:00:00 2001
From c4d1d49d376f4b935dad6b931e196f07ecebec88 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 14 Sep 2013 10:16:38 +1000
Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 6e9354f..0844b60 100644
index 87356e4..d8adce0 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -298,6 +298,10 @@ public abstract class EntityHuman extends EntityLiving {

2
CraftBukkit-Patches/0042-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch
View File

@ -1,4 +1,4 @@
From 278e9ad5469a08b0ad4b7a5b023361c7f7fad92d Mon Sep 17 00:00:00 2001
From 17b8ffe2da66b3b20f4f94f1501b9b1fc074fef6 Mon Sep 17 00:00:00 2001
From: BlackHole <black-hole@live.com>
Date: Tue, 16 Jul 2013 22:34:50 +0200
Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT

2
CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch
View File

@ -1,4 +1,4 @@
From 55d876c1cefd9c7fe8b7959d7af94435bfd60fd6 Mon Sep 17 00:00:00 2001
From e24ed94388631dd27adbceae9f42beef808fee1f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 21 Sep 2013 12:33:09 +1000
Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving

2
CraftBukkit-Patches/0044-Item-Despawn-Rate.patch
View File

@ -1,4 +1,4 @@
From 97da24a6e7b5d85dbd82820807708f1962e68b2f Mon Sep 17 00:00:00 2001
From 7095785388e597a8ffd61ae0358bfcc0d6aa325b 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

4
CraftBukkit-Patches/0045-Don-t-Special-Case-X-Move-Value.patch
View File

@ -1,11 +1,11 @@
From 206178759589ab1942cda1d8aa21a3336f1fd7b8 Mon Sep 17 00:00:00 2001
From ed75400b59931091386cd89f497a626717e1f026 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 6 Oct 2013 17:36:28 +1100
Subject: [PATCH] Don't Special Case X Move Value
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2bf9f49..6ffce8f 100644
index 5e5e6ba..03f6b05 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -108,6 +108,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

4
CraftBukkit-Patches/0046-Implement-respawn-API.patch
View File

@ -1,11 +1,11 @@
From ed784d4bf689c5e60c333806b8b63bf4334160d3 Mon Sep 17 00:00:00 2001
From e4c6e599c1e8c3d4d22b638596a6b72981bbd29e 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 bf9dd99..494c0bc 100644
index 6bdf188..26e77d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1327,6 +1327,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
CraftBukkit-Patches/0047-Arrow-Despawn-Rate.patch
View File

@ -1,4 +1,4 @@
From 14530ddad995a1001d4434971234b7a8ea765823 Mon Sep 17 00:00:00 2001
From d10d9936aef229648a523a1b8ccba61ce4f4b9da Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 14 Oct 2013 19:20:10 +1100
Subject: [PATCH] Arrow Despawn Rate

2
CraftBukkit-Patches/0048-Fix-packed-ice-generation.patch
View File

@ -1,4 +1,4 @@
From 6d6b5bcad06ca34d88abaa9cbeee95158d5925c6 Mon Sep 17 00:00:00 2001
From fd5af4b22b2622488b43a72fe74f29d2ec0adcc4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 17:52:14 +1100
Subject: [PATCH] Fix packed ice generation

10
CraftBukkit-Patches/0049-Watchdog-Thread.patch
View File

@ -1,4 +1,4 @@
From d4b5d31d08c0240e5ce5e8104c84e377e872efbb Mon Sep 17 00:00:00 2001
From 80cf3ea8dec4901f6ca9ec52b1cc93827b6e284f 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,10 +18,10 @@ index 390c6eb..240c909 100644
thread.setName("Server Watchdog");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1d67c07..65c3a66 100644
index 2c39a80..adbd92e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -537,6 +537,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -539,6 +539,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.a(crashreport);
} finally {
try {
@ -29,7 +29,7 @@ index 1d67c07..65c3a66 100644
this.stop();
this.isStopped = true;
} catch (Throwable throwable1) {
@@ -637,6 +638,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -639,6 +640,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.methodProfiler.b();
this.methodProfiler.b();
@ -39,7 +39,7 @@ index 1d67c07..65c3a66 100644
}
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644
index 0000000..429c258
index 0000000..429c2580
--- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +1,124 @@

2
CraftBukkit-Patches/0050-Clear-Flower-Pot-on-Drop.patch
View File

@ -1,4 +1,4 @@
From b3c989b0fb4d2fcdbf2f331c38e56ef1ce2e133f Mon Sep 17 00:00:00 2001
From 28a5cdec41be4bb97141e21bfabf8e583e4a5970 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 3 Dec 2013 11:07:48 +1100
Subject: [PATCH] Clear Flower Pot on Drop

2
CraftBukkit-Patches/0051-Fix-some-chunks-not-being-sent-to-the-client.patch
View File

@ -1,4 +1,4 @@
From 6e90d5453c0852c00ea47ba024d83ceb728f8aa4 Mon Sep 17 00:00:00 2001
From b21eab777645a11ea1aa708457f8529cfa12fd87 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Mon, 2 Dec 2013 23:42:09 +0000
Subject: [PATCH] Fix some chunks not being sent to the client

2
CraftBukkit-Patches/0052-Fix-Broken-Async-Chat.patch
View File

@ -1,4 +1,4 @@
From 5b8767e1d3aacd236a1e081e450ee69c3391de28 Mon Sep 17 00:00:00 2001
From 93ffd271994e903b983d5dd64811d4feb6c92f51 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 5 Dec 2013 13:55:53 +1100
Subject: [PATCH] Fix Broken Async Chat

8
CraftBukkit-Patches/0053-Orebfuscator.patch
View File

@ -1,4 +1,4 @@
From 65eae3b8ffa2e0ee6f4242b90aa2df6fc8b24721 Mon Sep 17 00:00:00 2001
From 0880b62865e0edb645d203f5189e37ae46293dd1 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 16 May 2013 18:51:05 +1000
Subject: [PATCH] Orebfuscator
@ -91,10 +91,10 @@ index e6145ac..34c22d2 100644
public void a(BlockPosition blockposition) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9b4e05a..045defc 100644
index 7c058fc..d3ee73d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -445,6 +445,7 @@ public abstract class World implements IBlockAccess {
@@ -458,6 +458,7 @@ public abstract class World implements IBlockAccess {
this.d(blockposition.up(), block);
this.d(blockposition.north(), block);
this.d(blockposition.south(), block);
@ -102,7 +102,7 @@ index 9b4e05a..045defc 100644
}
public void a(BlockPosition blockposition, Block block, EnumDirection enumdirection) {
@@ -658,9 +659,16 @@ public abstract class World implements IBlockAccess {
@@ -671,9 +672,16 @@ public abstract class World implements IBlockAccess {
return this.worldProvider.p()[this.getLightLevel(blockposition)];
}

2
CraftBukkit-Patches/0054-Optimize-DataWatcher.patch
View File

@ -1,4 +1,4 @@
From f1803422eba940c40a526653484f681e7f380846 Mon Sep 17 00:00:00 2001
From f73f0d7454e1a19c501a2cca873fbc490afad9ef Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:45:47 +1100
Subject: [PATCH] Optimize DataWatcher

2
CraftBukkit-Patches/0055-Fire-PreLogin-Events-in-Offline-Mode.patch
View File

@ -1,4 +1,4 @@
From 1fed60fae44318412d1b5b37820c7b6a38814d10 Mon Sep 17 00:00:00 2001
From 9e2c25116d18e4cd360d8c7a55b9e096e8648d39 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:32:10 +1100
Subject: [PATCH] Fire PreLogin Events in Offline Mode

6
CraftBukkit-Patches/0056-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From be18153c2049202699a2659ed4891f40ede9f117 Mon Sep 17 00:00:00 2001
From 78615740f588e09cc50cccc8d735de09200091fb 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
@ -132,7 +132,7 @@ index fe4121f..1d3d00f 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 0741d7b..69fa301 100644
index 537932a..dbb3324 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -559,7 +559,13 @@ public final class CraftServer implements Server {
@ -151,7 +151,7 @@ index 0741d7b..69fa301 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 494c0bc..37b8287 100644
index 26e77d2..edac4c7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1316,6 +1316,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
CraftBukkit-Patches/0057-Allow-Disabling-Zombie-Villager-Aggression.patch
View File

@ -1,4 +1,4 @@
From 2745cb1ef3ac96e96fc5147043cd587c5143aac3 Mon Sep 17 00:00:00 2001
From 7a2d55f11e40d55120d908d5eab00ce4a7768b42 Mon Sep 17 00:00:00 2001
From: Dylan Xaldin <Puremin0rez515@gmail.com>
Date: Thu, 12 Dec 2013 18:05:03 -0600
Subject: [PATCH] Allow Disabling Zombie Villager Aggression

4
CraftBukkit-Patches/0058-Configurable-Amount-of-Netty-Threads.patch
View File

@ -1,4 +1,4 @@
From 6ba534764c69a6f193cb1fce8af5d6e13a0f6b1e Mon Sep 17 00:00:00 2001
From 4e12fdec7d72b72b4ccdedef8613c25abac165c6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:58:58 +1100
Subject: [PATCH] Configurable Amount of Netty Threads
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Amount of Netty Threads
This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 65c3a66..79f0fdb 100644
index adbd92e..cdef354 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -61,7 +61,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs

2
CraftBukkit-Patches/0059-Prevent-Mineshaft-Saving.patch
View File

@ -1,4 +1,4 @@
From acccbf3a5331907ed855cafc8fba8b6ce8e995e7 Mon Sep 17 00:00:00 2001
From b00026fd4d2ee0827c2b68775bb4588aba80b93e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 15:21:02 +1100
Subject: [PATCH] Prevent Mineshaft Saving

6
CraftBukkit-Patches/0060-Log-Cause-of-Unexpected-Exceptions.patch
View File

@ -1,14 +1,14 @@
From cfaf51175deab8cb8606e574dbd5515b28dc55c8 Mon Sep 17 00:00:00 2001
From c502d8318bc17af0363db62a52b546c7d451cc16 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:39:14 +1100
Subject: [PATCH] Log Cause of Unexpected Exceptions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 79f0fdb..0d2682d 100644
index cdef354..6ff5211 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -518,6 +518,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -520,6 +520,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
}
} catch (Throwable throwable) {
MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);

9
CraftBukkit-Patches/0061-Particle-API.patch
View File

@ -1,19 +1,20 @@
From 2ab992704cc79f958e0f794be42191c004ecbed9 Mon Sep 17 00:00:00 2001
From cad4a665ef46edecb4d0f6769c06e8317fb683de 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
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
index 7de0de5..7eca388 100644
index 7de0de5..13f9e9d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftEffect.java
@@ -55,6 +55,8 @@ public class CraftEffect {
@@ -55,6 +55,9 @@ public class CraftEffect {
Validate.isTrue(((Material) data).isBlock(), "Material is not a block!");
datavalue = ((Material) data).getId();
break;
+ case ITEM_BREAK:
+ datavalue = ((Material) data).getId();
+ break;
default:
datavalue = 0;
}
@ -131,7 +132,7 @@ index 13f85d5..e395704 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 37b8287..fb1347e 100644
index edac4c7..8cc56d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1342,6 +1342,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
CraftBukkit-Patches/0062-Save-ticks-lived-to-nbttag.patch
View File

@ -1,4 +1,4 @@
From 8cd4d276b754d7b0967c9e00cb1bcb29ab60a8c0 Mon Sep 17 00:00:00 2001
From c23721d38a84ae8cfbdae9374b4640409979aad4 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

6
CraftBukkit-Patches/0063-More-Efficient-GetCubes.patch
View File

@ -1,14 +1,14 @@
From 7156eb1dd517f94b6411650424fc37e4bd394d9b Mon Sep 17 00:00:00 2001
From 8565af4935a9f8a438bacca374c5d4460a6ea368 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:17:37 +1000
Subject: [PATCH] More Efficient GetCubes
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 045defc..a35ec3f 100644
index d3ee73d..10f6210 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1037,33 +1037,60 @@ public abstract class World implements IBlockAccess {
@@ -1050,33 +1050,60 @@ public abstract class World implements IBlockAccess {
int i1 = MathHelper.floor(axisalignedbb.c);
int j1 = MathHelper.floor(axisalignedbb.f + 1.0D);

2
CraftBukkit-Patches/0064-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
View File

@ -1,4 +1,4 @@
From 3b6a6cd4f4eb99f3788c780cd02e47c7a4eed45c Mon Sep 17 00:00:00 2001
From fc6a0de243baacaac6b5a234beaa9a414c24ec69 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 Spawner's

2
CraftBukkit-Patches/0065-Warn-if-PermGen-may-be-insufficient.patch
View File

@ -1,4 +1,4 @@
From 423d560676e360967616e27a0699bb2a1ac123a6 Mon Sep 17 00:00:00 2001
From cf8f74feef3d3fbed4cd960837d6fa3c2d2201c6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 14:07:41 +1100
Subject: [PATCH] Warn if PermGen may be insufficient

4
CraftBukkit-Patches/0066-Disable-Connected-Check-on-setScoreboard.patch
View File

@ -1,11 +1,11 @@
From b0fb0d01c45d1489f6b10fda2fe987ec822cb115 Mon Sep 17 00:00:00 2001
From f1bdb825e52f4198145ecba2da30fb0f917a2924 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 fb1347e..a00d630 100644
index 8cc56d2..5767ab4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1239,7 +1239,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
CraftBukkit-Patches/0067-Add-Late-Bind-Option.patch
View File

@ -1,4 +1,4 @@
From 7a91f20d04ef923de42b623bab99e54f921820bd Mon Sep 17 00:00:00 2001
From 352b23038a34b51f4a10872b80543e57a0a23c9a Mon Sep 17 00:00:00 2001
From: slide23 <me@slide.ws>
Date: Fri, 20 Dec 2013 20:15:33 -0600
Subject: [PATCH] Add Late Bind Option

2
CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch
View File

@ -1,4 +1,4 @@
From 704d165c8f08c6ab3028c3f4721a49ae652d7f24 Mon Sep 17 00:00:00 2001
From 5fb23e4d43a4f4e324d53b49f766977aa3504d4b Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 7 Jan 2014 15:56:26 +0000
Subject: [PATCH] Allow statistics to be disabled/forced

2
CraftBukkit-Patches/0069-Fix-ItemStack-Unbreakable-Code.patch
View File

@ -1,4 +1,4 @@
From 59f1349abaf58fc3075438f33491036bd9f86dc8 Mon Sep 17 00:00:00 2001
From 9af964a3381eac330301137f6d1a4561a680c49c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 10 Jan 2014 15:15:50 +1100
Subject: [PATCH] Fix ItemStack Unbreakable Code

Some files were not shown because too many files have changed in this diff Show More