spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-08-05 16:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPIGOT-5679: Add config option for end portal activation sound

Browse source
This commit is contained in:
md_5 2020-05-09 18:48:11 +10:00
parent 2040c4c476
commit a2bdb11986
119 changed files with 363 additions and 326 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Bukkit-Patches/0001-POM-Changes.patch
View file

@ -1,11 +1,11 @@
From 79202d1827f4c19e82bf909d4dfda7d0f66e22c0 Mon Sep 17 00:00:00 2001
From fe623b1ff142c281e066306ad28b2a82de61eec1 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
diff --git a/pom.xml b/pom.xml
index a3a9061a..17633770 100644
index 92f99b14..87977e2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
@ -28,5 +28,5 @@ index a3a9061a..17633770 100644
<properties>
<skipTests>true</skipTests>
--
2.20.1
2.25.1

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

@ -1,4 +1,4 @@
From a0e9e28e05e7442161376b2163c4059b43e3f395 Mon Sep 17 00:00:00 2001
From 8dbf2ae19c31b88553fdfd30a37abafb3e07d572 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
@ -157,5 +157,5 @@ index d650da50..f740bebe 100644
+ // Spigot end
}
--
2.20.1
2.25.1

4
Bukkit-Patches/0003-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 1548474bcb6f7a2d7909d9cbae1b3d378fa4862b Mon Sep 17 00:00:00 2001
From 2e04cbe72df8404c67643e59a0b4a0bd6941882d 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
@ -460,5 +460,5 @@ index 00000000..a287faff
+ */
+package org.spigotmc;
--
2.20.1
2.25.1

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

@ -1,4 +1,4 @@
From 79deb9a49fa0db5128cd269d83380a42011d6054 Mon Sep 17 00:00:00 2001
From 0f626d79efc01cfc7322527b5947344ffbd4a126 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
@ -88,5 +88,5 @@ index 498f0be8..084ca8cf 100644
* Gets the current result of the login, as an enum
*
--
2.20.1
2.25.1

4
Bukkit-Patches/0005-Define-SpawnerSpawnEvent.patch
View file

@ -1,4 +1,4 @@
From 181c3806d5064679e12c5fb12d9ec6a076b3d0ae Mon Sep 17 00:00:00 2001
From a47f5fd1c15d467c92daddfbab2ad24c222a380c 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 SpawnerSpawnEvent
@ -35,5 +35,5 @@ index 00000000..9353f0d0
+ }
+}
--
2.20.1
2.25.1

4
Bukkit-Patches/0006-Entity-Mount-and-Dismount-Events.patch
View file

@ -1,4 +1,4 @@
From f8c73ebc4b4bf1eab2a00391c8198611491856e8 Mon Sep 17 00:00:00 2001
From 07ead3dfc42ff92ca93982f1d54b85c9e649fcc0 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
@ -123,5 +123,5 @@ index 00000000..264664eb
+ */
+package org.spigotmc.event.entity;
--
2.20.1
2.25.1

4
Bukkit-Patches/0007-Player-Collision-API.patch
View file

@ -1,4 +1,4 @@
From a2a803cf3ef18e8deb1cb1ca8ae748d56d72f285 Mon Sep 17 00:00:00 2001
From 352428b0c1e4a48fb396d60f033bb26c7bcdc6c3 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
@ -39,5 +39,5 @@ index e09637f4..a2794b79 100644
@NotNull
--
2.20.1
2.25.1

4
Bukkit-Patches/0008-Add-respawn-API.patch
View file

@ -1,4 +1,4 @@
From be4c55cc2390b0623519852013a86cc39d607e34 Mon Sep 17 00:00:00 2001
From a52c0c1aa2937ac9e7093003462ac20870276b6a 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.
@ -23,5 +23,5 @@ index a2794b79..b8ed0ba9 100644
@NotNull
--
2.20.1
2.25.1

4
Bukkit-Patches/0009-Add-support-for-fetching-hidden-players.patch
View file

@ -1,4 +1,4 @@
From 92564eaac4bfb4a37c48eadb5971f26892f17f8e Mon Sep 17 00:00:00 2001
From 28e756c2c8870859b4f0de2559bce1f0e9cd7261 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
@ -26,5 +26,5 @@ index b8ed0ba9..3988baf8 100644
@NotNull
--
2.20.1
2.25.1

4
Bukkit-Patches/0010-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From 78efa65b161d30baf0a351e2aacf504f695016ad Mon Sep 17 00:00:00 2001
From 574f4901e46e76265e7468e93bd220c49c997461 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
@ -58,5 +58,5 @@ index 4d308c5a..be347c3d 100644
@NotNull
--
2.20.1
2.25.1

4
Bukkit-Patches/0011-Add-PlayerSpawnLocationEvent.patch
View file

@ -1,4 +1,4 @@
From a0a00123a1e41543fcad86b8fec3e1de2291878f Mon Sep 17 00:00:00 2001
From 1b03b9769fb830f18e2b8dab735178ea75cbb2a1 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.
@ -74,5 +74,5 @@ index 00000000..6a2d5d84
+ */
+package org.spigotmc.event.player;
--
2.20.1
2.25.1

4
Bukkit-Patches/0012-Undeprecate-Player-updateInventory-V.patch
View file

@ -1,4 +1,4 @@
From 30ac2aeaee06ff94820b0bd826b001963ad9b6e4 Mon Sep 17 00:00:00 2001
From b1ec4148420860ebd0268671e083fcb113dddd2f 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
@ -21,5 +21,5 @@ index 3988baf8..e2a38451 100644
/**
--
2.20.1
2.25.1

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

@ -1,11 +1,11 @@
From b11df4e72cf1a266aac98561ac23382ec8620034 Mon Sep 17 00:00:00 2001
From c03c58d11418db95add2fdbabd8ee1d97433da86 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
diff --git a/pom.xml b/pom.xml
index b43811b5..8964b9e3 100644
index 87977e2f..186405ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,13 @@
@ -466,5 +466,5 @@ index f740bebe..94852d50 100644
@NotNull
--
2.20.1
2.25.1

4
Bukkit-Patches/0014-Add-restart-API.patch
View file

@ -1,4 +1,4 @@
From 11f0e62602f3938831f5159149365bbbdc1723af Mon Sep 17 00:00:00 2001
From 1fdb1775526b5bc7408d391b33e121f2ef88919a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 13 Jul 2015 19:10:15 +1000
Subject: [PATCH] Add restart API.
@ -23,5 +23,5 @@ index aba9b011..f6fb72fa 100644
@NotNull
--
2.20.1
2.25.1

4
Bukkit-Patches/0015-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 32fb50a31762e797f89d30a942c6095071b35ce7 Mon Sep 17 00:00:00 2001
From 5ca43fa198d7097361c90044a4d6e4cba39350b9 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 30 Jul 2019 13:47:34 -0700
Subject: [PATCH] View Distance
@ -26,5 +26,5 @@ index 387ef3f2..cd8a0957 100644
public class Spigot {
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0001-POM-Changes.patch
View file

@ -1,4 +1,4 @@
From 3c69cff0a573deb7d410001d2bbcacb5ad8ca547 Mon Sep 17 00:00:00 2001
From 2049b38957c8ae2f9d010a8d9bdea41d72540c6a 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
@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes
Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us.
diff --git a/pom.xml b/pom.xml
index fde4cdc0d..fdfe3bf1d 100644
index cfae8f8c5..9fc92e347 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
@ -97,5 +97,5 @@ index f905d17b6..93046379d 100644
if (stream != null) {
--
2.20.1
2.25.1

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

@ -1,4 +1,4 @@
From 7f8b79d0206c8600ed8f12bb4e34b7b762e165dd Mon Sep 17 00:00:00 2001
From bc3ed31cc06b6a071da94bb25e07ad114ec39869 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -25,10 +25,10 @@ index 1d7c64d2b..9c9c046e3 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 530dd9c83..c6f2c70c8 100644
index 5318dfd2b..d387bf11c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2290,4 +2290,15 @@ public class CraftWorld implements World {
@@ -2288,4 +2288,15 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}
@ -161,5 +161,5 @@ index cdd7342d0..619805fc1 100644
+ // Spigot end
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0003-mc-dev-imports.patch
View file

@ -1,4 +1,4 @@
From 450f51780c2c0f83358a63580061082067a2cdb5 Mon Sep 17 00:00:00 2001
From deaa2e80934abf970e058783598d02bd11231b80 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
@ -4061,5 +4061,5 @@ index 000000000..9f74e708a
+ }
+}
--
2.20.1
2.25.1

10
CraftBukkit-Patches/0004-Spigot-Configuration.patch
View file

@ -1,4 +1,4 @@
From e0b5417d1e17e95aa1c6e520811f805f00d22038 Mon Sep 17 00:00:00 2001
From 1a69f0111586d17a6078aa45b970205f843e1c15 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
@ -31,7 +31,7 @@ index ed6b39dcd..1b15e3270 100644
server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0a274e209..6f05e3a3b 100644
index cd9601608..74f6b92ef 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -67,6 +67,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -51,7 +51,7 @@ index 0a274e209..6f05e3a3b 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 52ce4b649..b605d0c3c 100644
index 9c9c046e3..8b039899a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -747,6 +747,7 @@ public final class CraftServer implements Server {
@ -78,7 +78,7 @@ index 52ce4b649..b605d0c3c 100644
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 7253b1a3a..7d9a1851d 100644
index ec97b815c..88223a53c 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -121,6 +121,14 @@ public class Main {
@ -381,5 +381,5 @@ index 000000000..1cce14866
+ }
+}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0005-Crop-Growth-Rates.patch
View file

@ -1,4 +1,4 @@
From 457c54a5c3c78afacf810b9fd1a0236241af4ed5 Mon Sep 17 00:00:00 2001
From c25513b7b8a40b6331fcd8be1a9ecd15913a7cd8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 7 Mar 2016 22:14:13 +1100
Subject: [PATCH] Crop Growth Rates
@ -256,5 +256,5 @@ index 1cce14866..fb9c4fc78 100644
+ }
}
--
2.20.1
2.25.1

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

@ -1,4 +1,4 @@
From e37e8703a89baae7c974ea9c182401978cf2e2de Mon Sep 17 00:00:00 2001
From a71bbcd680ec840a570aed8a5c2dfd99bb812891 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
@ -31,10 +31,10 @@ index 128672792..6cf9455a4 100644
} else {
a(entityitem, itemstack1, this, itemstack);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 4602d978a..a9861b4ef 100644
index 75cae1071..414ebdfe0 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -534,6 +534,23 @@ public class CraftEventFactory {
@@ -542,6 +542,23 @@ public class CraftEventFactory {
event = CraftEventFactory.callProjectileLaunchEvent(entity);
} else if (entity.getBukkitEntity() instanceof org.bukkit.entity.Vehicle) {
event = CraftEventFactory.callVehicleCreateEvent(entity);
@ -82,5 +82,5 @@ index fb9c4fc78..8c855cf9b 100644
+ }
}
--
2.20.1
2.25.1

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

@ -1,4 +1,4 @@
From 7f06616f08eb73f0891ec87f61186be7048db9a2 Mon Sep 17 00:00:00 2001
From 8a7f85758da06bc53fca5bc1e4d609611d7bb6c9 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
@ -37,7 +37,7 @@ index f047e024b..ca9ed5739 100644
if (map.containsKey(irecipe.getKey())) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 1e6bc4a42..16938a198 100644
index 25ee7f327..c05fa2682 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -776,6 +776,7 @@ public abstract class EntityLiving extends Entity {
@ -125,7 +125,7 @@ index 8b039899a..6446de65f 100644
if (commandMap.dispatch(sender, commandLine)) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c6f2c70c8..923b46bc5 100644
index d387bf11c..99cf42026 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -381,6 +381,7 @@ public class CraftWorld implements World {
@ -160,7 +160,7 @@ index c6f2c70c8..923b46bc5 100644
IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
// If generate = false, but the chunk already exists, we will get this back.
@@ -1091,6 +1095,7 @@ public class CraftWorld implements World {
@@ -1089,6 +1093,7 @@ public class CraftWorld implements World {
@Override
public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<Entity> filter) {
@ -168,7 +168,7 @@ index c6f2c70c8..923b46bc5 100644
Validate.notNull(boundingBox, "Bounding box is null!");
AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
@@ -1245,6 +1250,7 @@ public class CraftWorld implements World {
@@ -1243,6 +1248,7 @@ public class CraftWorld implements World {
@Override
public void save() {
@ -248,5 +248,5 @@ index 000000000..aeed76972
+ }
+}
--
2.20.1
2.25.1

10
CraftBukkit-Patches/0008-View-Distance.patch
View file

@ -1,4 +1,4 @@
From d210b7e571a295dad1cb39f808a3ab03298bf52e Mon Sep 17 00:00:00 2001
From 61251313dad916199bab66f87bbca3a108cd3cc1 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
@ -6,7 +6,7 @@ Subject: [PATCH] View Distance
This commit allows the user to select per world view distances.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index f0bf4fd62..13f989cd5 100644
index f999f3b83..46fbf941c 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -125,7 +125,8 @@ public abstract class PlayerList {
@ -41,10 +41,10 @@ index bbe5a08f2..9fc569a14 100644
});
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 923b46bc5..56b53d51d 100644
index 99cf42026..aceb9712d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2297,6 +2297,13 @@ public class CraftWorld implements World {
@@ -2295,6 +2295,13 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}
@ -87,5 +87,5 @@ index 8c855cf9b..be0540352 100644
+ }
}
--
2.20.1
2.25.1

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

@ -1,4 +1,4 @@
From 9d6c14b4f982bd050bbf0e56cfc36ab0e577af4f Mon Sep 17 00:00:00 2001
From 2cef96af8755932d08dc0b5fa82966bd0c40e66b 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
@ -164,7 +164,7 @@ index 0d66ff2c7..9ae74680c 100644
protected BlockPosition ag() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 16938a198..6e9eed0bb 100644
index c05fa2682..fa6efb644 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -37,6 +37,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -176,7 +176,7 @@ index 16938a198..6e9eed0bb 100644
public abstract class EntityLiving extends Entity {
private static final UUID b = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
@@ -2252,6 +2254,7 @@ public abstract class EntityLiving extends Entity {
@@ -2255,6 +2257,7 @@ public abstract class EntityLiving extends Entity {
@Override
public void tick() {
@ -184,7 +184,7 @@ index 16938a198..6e9eed0bb 100644
super.tick();
this.o();
this.r();
@@ -2339,7 +2342,9 @@ public abstract class EntityLiving extends Entity {
@@ -2342,7 +2345,9 @@ public abstract class EntityLiving extends Entity {
}
}
@ -194,7 +194,7 @@ index 16938a198..6e9eed0bb 100644
double d0 = this.locX() - this.lastX;
double d1 = this.locZ() - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -2420,6 +2425,7 @@ public abstract class EntityLiving extends Entity {
@@ -2423,6 +2428,7 @@ public abstract class EntityLiving extends Entity {
this.pitch = 0.0F;
}
@ -202,7 +202,7 @@ index 16938a198..6e9eed0bb 100644
}
protected float f(float f, float f1) {
@@ -2498,6 +2504,7 @@ public abstract class EntityLiving extends Entity {
@@ -2501,6 +2507,7 @@ public abstract class EntityLiving extends Entity {
this.setMot(d4, d5, d6);
this.world.getMethodProfiler().enter("ai");
@ -210,7 +210,7 @@ index 16938a198..6e9eed0bb 100644
if (this.isFrozen()) {
this.jumping = false;
this.aZ = 0.0F;
@@ -2507,6 +2514,7 @@ public abstract class EntityLiving extends Entity {
@@ -2510,6 +2517,7 @@ public abstract class EntityLiving extends Entity {
this.doTick();
this.world.getMethodProfiler().exit();
}
@ -218,7 +218,7 @@ index 16938a198..6e9eed0bb 100644
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("jump");
@@ -2530,7 +2538,9 @@ public abstract class EntityLiving extends Entity {
@@ -2533,7 +2541,9 @@ public abstract class EntityLiving extends Entity {
this.n();
AxisAlignedBB axisalignedbb = this.getBoundingBox();
@ -228,7 +228,7 @@ index 16938a198..6e9eed0bb 100644
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("push");
if (this.bn > 0) {
@@ -2538,7 +2548,9 @@ public abstract class EntityLiving extends Entity {
@@ -2541,7 +2551,9 @@ public abstract class EntityLiving extends Entity {
this.a(axisalignedbb, this.getBoundingBox());
}
@ -815,5 +815,5 @@ index a85fbbb69..3f55381c1 100644
+ // Spigot end
}
--
2.20.1
2.25.1

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

@ -1,4 +1,4 @@
From 7d18ef8beaee2e198f4be314956683cca04bda4b Mon Sep 17 00:00:00 2001
From 85123bba02de99adc11ab1a497779ec815ab3e5c 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
@ -64,5 +64,5 @@ index be0540352..03deec359 100644
+ }
}
--
2.20.1
2.25.1

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

@ -1,4 +1,4 @@
From 4f5acd6ae00e289c51f94cd55c0cf0061184c073 Mon Sep 17 00:00:00 2001
From 5ec5bd13614b1d45367c00981a84bfb8c7724283 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
@ -23,5 +23,5 @@ index 3717444bc..e48cb6991 100644
if (!tileentity.isRemoved() && tileentity.hasWorld()) {
BlockPosition blockposition = tileentity.getPosition();
--
2.20.1
2.25.1

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

@ -1,11 +1,11 @@
From 69fc5953090bce25d947764f9b8e304be1a90888 Mon Sep 17 00:00:00 2001
From 81e6f622e6ef62402057ef550536b5c51e8ed6ea 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
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 7402a094c..0595fb3e1 100644
index 6cf9455a4..fc662b5d6 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -125,7 +125,7 @@ public class EntityItem extends Entity {
@ -43,5 +43,5 @@ index 03deec359..7dd66b48e 100644
+ }
}
--
2.20.1
2.25.1

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

@ -1,4 +1,4 @@
From 746d3eba7ded7ce786ef6719f59cbe4bd532e2e1 Mon Sep 17 00:00:00 2001
From 083d7f74a15615f094d1ba032cfc416f5cb30ed5 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
@ -181,7 +181,7 @@ index fc662b5d6..208dad2a3 100644
Vec3D vec3d = this.getMot();
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 6e9eed0bb..3b1bcf349 100644
index fa6efb644..9d1adaaa2 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -135,6 +135,13 @@ public abstract class EntityLiving extends Entity {
@ -581,5 +581,5 @@ index 7dd66b48e..d873b32b9 100644
+ }
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0014-Metrics.patch
View file

@ -1,4 +1,4 @@
From 82cdf64662a9a51154f3729f161a5a5192599d1b Mon Sep 17 00:00:00 2001
From 86d1e3baa7d3a0f3dbd8e8d857740dac77421d15 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
@ -687,5 +687,5 @@ index 7b14d3164..2a585d004 100644
static void readConfig(Class<?> clazz, Object instance)
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0015-Entity-Tracking-Ranges.patch
View file

@ -1,4 +1,4 @@
From 821df9063b4b3cc509f3ab4d909a6adc1c39cf03 Mon Sep 17 00:00:00 2001
From 98e639732f513547206bab350e0f63dd09cb6e2c 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
@ -12,7 +12,7 @@ This has multiple benefits:
4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames.
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index ccb22fdcc..1596ef9b2 100644
index 30b2b2c47..8a8abe1bb 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -988,6 +988,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -105,5 +105,5 @@ index 000000000..6f8e6c1d0
+ }
+}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0016-Remove-o-Option.patch
View file

@ -1,4 +1,4 @@
From f2b37914df9507e985e0ee1fdcf27579c0d8d414 Mon Sep 17 00:00:00 2001
From cb46026ebe1db22731284acffceab73a32a3c80f 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
@ -19,5 +19,5 @@ index 5a339e191..d7e81a6d9 100644
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0017-Hopper-Customisations.patch
View file

@ -1,4 +1,4 @@
From d0a50b3a8be00f37b71808ebf964298cebeaa399 Mon Sep 17 00:00:00 2001
From 36d0f41bd921a2c1fe67cc3dde47e6ebfc18ce7c 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
@ -132,5 +132,5 @@ index 48bda1ed0..5b5eacb38 100644
+ }
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0018-Allow-Disabling-of-Command-Logging.patch
View file

@ -1,4 +1,4 @@
From 57ff3426ed4b1dc5f098b4a0970624880becd106 Mon Sep 17 00:00:00 2001
From 6f0d41cf93430daeff6ece0bd3e71bc67011f3e3 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
@ -32,5 +32,5 @@ index 2a585d004..1e393421c 100644
+ }
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0019-Allow-Disabling-of-Command-TabComplete.patch
View file

@ -1,4 +1,4 @@
From 8694554c5fb0d81d5f6a30622e7f67a76fb6d5ed Mon Sep 17 00:00:00 2001
From d482e1583c73f9ce621fecd983c5ef05c3c40f64 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
@ -25,7 +25,7 @@ index 37df72320..37b1a7947 100644
if (commandnode2.canUse(commandlistenerwrapper)) {
ArgumentBuilder argumentbuilder = commandnode2.createBuilder(); // CraftBukkit - decompile error
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9c958eee5..31f73000f 100644
index a57715832..0839b4968 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1636,6 +1636,13 @@ public final class CraftServer implements Server {
@ -71,5 +71,5 @@ index 1e393421c..fed02c9b1 100644
+ }
}
--
2.20.1
2.25.1

8
CraftBukkit-Patches/0020-Configurable-Messages.patch
View file

@ -1,4 +1,4 @@
From e2ef9b32f024751ef4c78a5916e6c6dbcb6f9763 Mon Sep 17 00:00:00 2001
From c1fb2f8f62a6290944d7ec9da606c6dd43b30918 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
@ -23,7 +23,7 @@ index a9776ee0d..aec42c066 100644
this.b.close(chatmessage);
} else {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index b97e1f30a..c20fcd777 100644
index 46fbf941c..6fdefb068 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -475,7 +475,7 @@ public abstract class PlayerList {
@ -45,7 +45,7 @@ index b97e1f30a..c20fcd777 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 31f73000f..89ab05a9d 100644
index 0839b4968..36547ea9d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -704,11 +704,11 @@ public final class CraftServer implements Server {
@ -106,5 +106,5 @@ index fed02c9b1..60d14fa25 100644
+ }
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0021-Properly-Close-Inventories.patch
View file

@ -1,4 +1,4 @@
From 3bf7586cba116b9932f1e15d66e73a989e66a0d4 Mon Sep 17 00:00:00 2001
From f35bfe34666037b7b0ad8abc54bcf1eb0bc237b3 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,7 +6,7 @@ Subject: [PATCH] Properly Close Inventories
Properly close inventories when unloading and switching worlds.
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 101ee0287..baaa0e311 100644
index c3a6848ef..568f879a6 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1021,6 +1021,21 @@ public class WorldServer extends World {
@ -51,5 +51,5 @@ index 101ee0287..baaa0e311 100644
if (!(entity instanceof EntityPlayer)) {
if (this.tickingEntities) {
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0022-Disallow-Interaction-With-Self.patch
View file

@ -1,4 +1,4 @@
From 8d18094ba282b5a01bd9b9b2c5992274c9a51ca0 Mon Sep 17 00:00:00 2001
From 2b3c9909caf206c1ff42d7675a9b3c17ea009e66 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
@ -23,5 +23,5 @@ index 9163737c7..d8f758ee1 100644
this.player.resetIdleTimer();
if (entity != null) {
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0023-Entity-Mount-and-Dismount-Events.patch
View file

@ -1,11 +1,11 @@
From 0d2fcf32d1aa45f97b21e002f3112cd356f827fe Mon Sep 17 00:00:00 2001
From 99c2f5df02bd6372e21e3675dee2649b82901650 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 54ab3fe9a..f439e808e 100644
index 416e4da81..5eaaff75a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1943,6 +1943,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@ -40,5 +40,5 @@ index 54ab3fe9a..f439e808e 100644
entity.j = 60;
}
--
2.20.1
2.25.1

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

@ -1,4 +1,4 @@
From f4a2f7e7e8b36e6e08386b915f59d8fe38ce674f Mon Sep 17 00:00:00 2001
From 53ce6928cd4ad13210b6ce263ed00a7406e71852 Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com>
Date: Tue, 11 Jun 2013 15:23:03 -0400
Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
Check if the player is still connected after firing event. Fixes BUKKIT-4327
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index c20fcd777..688a680eb 100644
index 6fdefb068..2c5b7181d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -614,6 +614,11 @@ public abstract class PlayerList {
@ -22,5 +22,5 @@ index c20fcd777..688a680eb 100644
location = respawnEvent.getRespawnLocation();
if (!flag) entityplayer.reset(); // SPIGOT-4785
--
2.20.1
2.25.1

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

@ -1,11 +1,11 @@
From 40e61636db77ceede3464dade8e9c629a58a45f0 Mon Sep 17 00:00:00 2001
From fd38da8811dfb685aab9a6610ff875190d09db71 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 f4420e5e9..85b325fde 100644
index cdb45b050..5efe62458 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1639,6 +1639,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -26,5 +26,5 @@ index f4420e5e9..85b325fde 100644
public Player.Spigot spigot()
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0026-Fully-Disable-Snooper-When-Not-Required.patch
View file

@ -1,11 +1,11 @@
From 0cb74e38a69bb18762ecdcc1b9b000a6ea382974 Mon Sep 17 00:00:00 2001
From 9a8d92d8fe3d7f35ad156ef098ba159ab735f3ed 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 9a8b0a398..344b8b94c 100644
index f97e507e1..493aa24c4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -966,11 +966,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -23,5 +23,5 @@ index 9a8b0a398..344b8b94c 100644
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0027-Don-t-Special-Case-X-Move-Value.patch
View file

@ -1,11 +1,11 @@
From d9d99d140b9f6963e002f2936c91b06087b407aa Mon Sep 17 00:00:00 2001
From 79f070aa23c2f385a68e63527fe20258eb7075e3 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 cc21ca5bb..d8a2e5582 100644
index d8f758ee1..a8051821a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -127,6 +127,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -52,5 +52,5 @@ index cc21ca5bb..d8a2e5582 100644
PlayerMoveEvent event = new PlayerMoveEvent(player, from, to);
this.server.getPluginManager().callEvent(event);
--
2.20.1
2.25.1

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

@ -1,11 +1,11 @@
From 3e58b5989058fd3fccffd0dc597000a9a5c700e5 Mon Sep 17 00:00:00 2001
From adddbc44a68861c2c6010f1177429badbf0c6574 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 85b325fde..265680f47 100644
index 5efe62458..778b4c0f8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1649,6 +1649,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -25,5 +25,5 @@ index 85b325fde..265680f47 100644
public Player.Spigot spigot()
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0029-Arrow-Despawn-Rate.patch
View file

@ -1,4 +1,4 @@
From 0eafd3e431099bf40768e75f9a75a7293db31d81 Mon Sep 17 00:00:00 2001
From 07433b815c3b172ba8b6dffb9755dde5f76f694b 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
@ -36,5 +36,5 @@ index 5b5eacb38..3ecd5c3d7 100644
+ }
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0030-Watchdog-Thread.patch
View file

@ -1,4 +1,4 @@
From 808cfb21d718be8e31d038aa103c5240e72e6987 Mon Sep 17 00:00:00 2001
From ba2496f81037c5125c4f31017dc61d599a81a423 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.
@ -38,7 +38,7 @@ index 493aa24c4..ba13b1723 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 89ab05a9d..7ed9e9579 100644
index 36547ea9d..f339a2587 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1603,7 +1603,7 @@ public final class CraftServer implements Server {
@ -355,5 +355,5 @@ index 000000000..8b3732202
+ }
+}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0031-Fix-Broken-Async-Chat.patch
View file

@ -1,4 +1,4 @@
From 747146aab89d9e61f3570a460673450d963926cc Mon Sep 17 00:00:00 2001
From b36bde0482e070a7a9ebb8dee25fbcbc2402ea6e 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
@ -35,5 +35,5 @@ index 699815b3d..b2ca841b4 100644
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0032-Fire-PreLogin-Events-in-Offline-Mode.patch
View file

@ -1,4 +1,4 @@
From 9c73c116a3f9f20d1c7c5935d37f3b7371a5e438 Mon Sep 17 00:00:00 2001
From 145b711949e7088f020f34e41707973cd8b3d50b 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
@ -148,5 +148,5 @@ index 47b6343f3..aea85fd72 100644
this.disconnect(new ChatMessage("multiplayer.disconnect.unexpected_query_response", new Object[0]));
}
--
2.20.1
2.25.1

10
CraftBukkit-Patches/0033-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From 04e8f614145d23e94b5eae728f534416719bb39d Mon Sep 17 00:00:00 2001
From 7caca4defc8e495e662149aa03dd2f102fa0812b 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
@ -115,7 +115,7 @@ index 6aeea22ae..4f008e472 100644
this.d = EnumProtocol.a(packetdataserializer.i());
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 18f0e0767..19af53bbf 100644
index 2c5b7181d..09d7a0970 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -461,7 +461,7 @@ public abstract class PlayerList {
@ -128,7 +128,7 @@ index 18f0e0767..19af53bbf 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 7ed9e9579..f1f9254fb 100644
index f339a2587..b5691f80f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -626,7 +626,13 @@ public final class CraftServer implements Server {
@ -147,7 +147,7 @@ index 7ed9e9579..f1f9254fb 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 265680f47..ddeefa4ff 100644
index 778b4c0f8..76b6e0e21 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1640,6 +1640,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -183,5 +183,5 @@ index 37bf0cec0..642f3a39a 100644
+ }
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0034-Allow-Disabling-Zombie-Villager-Aggression.patch
View file

@ -1,4 +1,4 @@
From 369d915c775c97a9bf3978b37191adf46d69e3e8 Mon Sep 17 00:00:00 2001
From f0961a5015bf2f37ac405a7764d2339bf440cc70 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
@ -35,5 +35,5 @@ index 3ecd5c3d7..d8678f2c1 100644
+ }
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0035-Configurable-Amount-of-Netty-Threads.patch
View file

@ -1,4 +1,4 @@
From c153a436fe5c54425234db6b5f67cd2bafc77cf2 Mon Sep 17 00:00:00 2001
From 9582cf418caf24fd202d040d6f23c8941a70e4d6 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 3feb2a24e..73f51c150 100644
index ba13b1723..881cefea3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -187,7 +187,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -44,5 +44,5 @@ index 642f3a39a..a7bf7f860 100644
+ }
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0036-Log-Cause-of-Unexpected-Exceptions.patch
View file

@ -1,11 +1,11 @@
From 94264f6a79a28a2b65f3517be7a67a686b1d981b Mon Sep 17 00:00:00 2001
From dd6f935a138fb51882eb60690564ddccd3b422c8 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 73f51c150..190453f96 100644
index 881cefea3..eda566dfa 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -801,6 +801,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -22,5 +22,5 @@ index 73f51c150..190453f96 100644
if (throwable instanceof ReportedException) {
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0037-Save-ticks-lived-to-nbttag.patch
View file

@ -1,11 +1,11 @@
From 00dcb34cd92788a3fea4d90528798f6bf047fbce Mon Sep 17 00:00:00 2001
From 39a9768ba5952b208ec48f40afad2cd1f51dbf4a 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 f439e808e..7cc7c2169 100644
index 5eaaff75a..d691b9b7a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1515,6 +1515,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@ -26,5 +26,5 @@ index f439e808e..7cc7c2169 100644
if (entity instanceof EntityTameableAnimal && !isLevelAtLeast(nbttagcompound, 2) && !nbttagcompound.getBoolean("PersistenceRequired")) {
EntityInsentient entityinsentient = (EntityInsentient) entity;
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0038-Add-Option-to-Nerf-Mobs-from-Spawners.patch
View file

@ -1,4 +1,4 @@
From 863425a5dd8006230941e86aa972d3be2f97bab4 Mon Sep 17 00:00:00 2001
From d695b1338cde9c769e316eb8fa770e2175fb850e 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
@ -38,5 +38,5 @@ index d8678f2c1..87adb772f 100644
+ }
}
--
2.20.1
2.25.1

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

@ -1,11 +1,11 @@
From 7f73d3b26011ff045d695ae0270094b393ac5093 Mon Sep 17 00:00:00 2001
From 5de1151caabe010535f357ce1869b657986fccf1 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 ddeefa4ff..5a89ed1a9 100644
index 76b6e0e21..e08950931 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1410,7 +1410,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -18,5 +18,5 @@ index ddeefa4ff..5a89ed1a9 100644
this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0040-Allow-statistics-to-be-disabled-forced.patch
View file

@ -1,4 +1,4 @@
From f9e333791e30c08e94db2698952ff65073957ed1 Mon Sep 17 00:00:00 2001
From 13282f89243170c51493b96ede05a37fcb0f2c25 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
@ -94,5 +94,5 @@ index a7bf7f860..7f42259e6 100644
+ }
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0041-Try-and-Debug-Crash-Reports-Crashing.patch
View file

@ -1,11 +1,11 @@
From 992b388c2225c1eb805dda5f137aa46e89e8e172 Mon Sep 17 00:00:00 2001
From ddbe535b5cf14c1a425c7a6033a6e05b8dd2dc7c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 20:56:41 +1100
Subject: [PATCH] Try and Debug Crash Reports Crashing
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 190453f96..9ea4c1ee0 100644
index eda566dfa..bc4bb90e7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1046,7 +1046,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -25,5 +25,5 @@ index 190453f96..9ea4c1ee0 100644
worldserver.a(crashreport);
throw new ReportedException(crashreport);
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0042-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
View file

@ -1,4 +1,4 @@
From ee61547b3b4f8965f9a33526e0c15ed3163e4069 Mon Sep 17 00:00:00 2001
From ec6044256bbb42fddc1222d9bb41d2d7785e380b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 20 Jan 2014 13:44:07 +1100
Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.
@ -29,5 +29,5 @@ index 6e46754f1..369f7c13a 100644
nbtreadlimiter.a(32L * (long) j);
int[] aint = new int[j];
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0043-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
View file

@ -1,4 +1,4 @@
From aa146587349e8fde3b5777f0c632d58def36ae47 Mon Sep 17 00:00:00 2001
From 1e3f714d4ef23fea8c0d0a7e2c388cf384fdc142 Mon Sep 17 00:00:00 2001
From: Dmck2b <dmck2b+github@gmail.com>
Date: Mon, 20 Jan 2014 20:18:23 +0000
Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks
@ -34,5 +34,5 @@ index 87adb772f..02326721c 100644
+ }
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0044-Highly-Optimized-Tick-Loop.patch
View file

@ -1,11 +1,11 @@
From 7286d2a5cf2dd633570842a8da758da77070b81b Mon Sep 17 00:00:00 2001
From 8c62d42ce1e4e62988b1c21152b62a7b4c73cb9c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 26 Jan 2017 21:50:51 +0000
Subject: [PATCH] Highly Optimized Tick Loop
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9ea4c1ee0..a5d54a49f 100644
index bc4bb90e7..d0ad2fa87 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -166,6 +166,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -131,5 +131,5 @@ index 000000000..be2e31dea
+ }
+}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0045-Configurable-Ping-Sample-Size.patch
View file

@ -1,4 +1,4 @@
From 34f5b629d93cb1f5cdc476b3e0c2419da2d05f24 Mon Sep 17 00:00:00 2001
From 7d1efeec2a374dc56faa526116f4e67fed6d485b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 26 Jan 2014 21:48:34 +1100
Subject: [PATCH] Configurable Ping Sample Size
@ -39,5 +39,5 @@ index d97bc8a3f..6925ab591 100644
+ }
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0046-Add-Optional-Tick-Shuffling.patch
View file

@ -1,4 +1,4 @@
From 6a19941408963defd6ffc29f35afc299858831a3 Mon Sep 17 00:00:00 2001
From 1d55ae0a788bc05b065e602fb612bf5c1baca256 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 27 Jan 2014 08:39:26 +1100
Subject: [PATCH] Add Optional Tick Shuffling
@ -39,5 +39,5 @@ index 6925ab591..3ce9fa744 100644
+ }
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0047-Spam-Filter-Exclusions.patch
View file

@ -1,4 +1,4 @@
From 20e3f2f2c202567ea31e44462b9eeb98307de3df Mon Sep 17 00:00:00 2001
From efe7ad5d50b0743548b52a49d407b32f8d557696 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions
@ -57,5 +57,5 @@ index 3ce9fa744..fb4897757 100644
+ }
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0048-Add-Option-to-Silence-CommandBlock-Console.patch
View file

@ -1,4 +1,4 @@
From c4c0fec6d7c406d5f97d95f01ff7e2a32a506a99 Mon Sep 17 00:00:00 2001
From 4a9142a07fe5f61904c03032e45afffdb8558559 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 9 Feb 2014 14:39:01 +1100
Subject: [PATCH] Add Option to Silence CommandBlock Console
@ -33,5 +33,5 @@ index fb4897757..dc7ea3b35 100644
+ }
}
--
2.20.1
2.25.1

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

@ -1,11 +1,11 @@
From 71f6ac668e838597360c423239e2b005eb6a0397 Mon Sep 17 00:00:00 2001
From 427d4e94e366a4b2bf676a3eb4f96a270069ed3c 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 5a89ed1a9..1514a4970 100644
index e08950931..b3a239c07 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1664,6 +1664,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -28,5 +28,5 @@ index 5a89ed1a9..1514a4970 100644
public Player.Spigot spigot()
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0050-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
View file

@ -1,11 +1,11 @@
From 88ea90c70f3b5b3ebe6f6329673bc9a80d719f91 Mon Sep 17 00:00:00 2001
From 133c5958fae1da92656e94cdc0c0c3891c61eb81 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 12 Feb 2014 20:44:14 +0000
Subject: [PATCH] Allow vanilla commands to be the main version of a command
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 16efb9af8..6ad4adaf0 100644
index b5691f80f..3d955009b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -378,8 +378,11 @@ public final class CraftServer implements Server {
@ -78,5 +78,5 @@ index dc7ea3b35..de35b3907 100644
+ }
}
--
2.20.1
2.25.1

8
CraftBukkit-Patches/0051-Implement-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From 73369c42057f47bdeafc03086204a384efda50b7 Mon Sep 17 00:00:00 2001
From fc2a37c0402d4edd400a0550d589ae0f34f80437 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@ -41,10 +41,10 @@ index c074d7a40..7c518983a 100644
// this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 56b53d51d..9a43dcb62 100644
index aceb9712d..3f420be58 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2307,6 +2307,22 @@ public class CraftWorld implements World {
@@ -2305,6 +2305,22 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{
@ -84,5 +84,5 @@ index 1d4ba473a..e41de11c1 100644
@Override
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0052-Use-one-PermissibleBase-for-all-Command-Blocks.patch
View file

@ -1,4 +1,4 @@
From c142b7ef71d7a6a4a452d3307ddaf9622ba830f1 Mon Sep 17 00:00:00 2001
From 7a5fe2ddeab6cc0209c26027fe337574c6882edb Mon Sep 17 00:00:00 2001
From: FrozenBrain <carstenbamsti@googlemail.com>
Date: Sun, 2 Mar 2014 21:13:46 +0100
Subject: [PATCH] Use one PermissibleBase for all Command Blocks
@ -29,5 +29,5 @@ index 0459f5dfb..c914c027f 100644
@Override
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0053-Prevent-hoppers-from-loading-chunks.patch
View file

@ -1,4 +1,4 @@
From 7d61d7403b2881ef789108c306797a92fe73efaf Mon Sep 17 00:00:00 2001
From 7548f5533516bafe3e2ba2b7aef37fb6a6dfc081 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 5 Mar 2014 20:27:27 +0000
Subject: [PATCH] Prevent hoppers from loading chunks
@ -17,5 +17,5 @@ index f2b7c9b4d..907d088c8 100644
Block block = iblockdata.getBlock();
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0054-Cancellable-WitherSkull-potion-effect.patch
View file

@ -1,4 +1,4 @@
From 8beb3a17b49f3a3bddd17b1174d189859ae2e9f1 Mon Sep 17 00:00:00 2001
From 40dcdf0f4bae9900d0f7592fbf1655c367e1d84f Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Tue, 25 Feb 2014 15:15:26 -0400
Subject: [PATCH] Cancellable WitherSkull potion effect
@ -36,5 +36,5 @@ index 6f391cc99..4c0bb6bc1 100644
if (this.world.getDifficulty() == EnumDifficulty.NORMAL) {
--
2.20.1
2.25.1

47
CraftBukkit-Patches/0055-Configurable-dragon-death-and-wither-spawn-sounds.patch
View file

@ -1,11 +1,11 @@
From 89da842d89062a3b065b197ddfaea9494cb815be Mon Sep 17 00:00:00 2001
From 82543f00db9d597bf943b7ffdd58890ccaa9fad4 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sat, 29 Mar 2014 13:44:25 -0400
Subject: [PATCH] Configurable dragon death and wither spawn sounds
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index 1b00c266d..e11ccdbd8 100644
index 66e70529e..d4fd58414 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -570,7 +570,24 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@ -46,11 +46,42 @@ index a457de6f6..2edf466ee 100644
if (distanceSquared > viewDistance * viewDistance) {
double deltaLength = Math.sqrt(distanceSquared);
double relativeX = player.locX() + (deltaX / deltaLength) * viewDistance;
diff --git a/src/main/java/net/minecraft/server/ItemEnderEye.java b/src/main/java/net/minecraft/server/ItemEnderEye.java
index 2c1a99f2f..b9ffbb7c1 100644
--- a/src/main/java/net/minecraft/server/ItemEnderEye.java
+++ b/src/main/java/net/minecraft/server/ItemEnderEye.java
@@ -34,7 +34,25 @@ public class ItemEnderEye extends Item {
}
}
- world.b(1038, blockposition1.b(1, 0, 1), 0);
+ // CraftBukkit start - Use relative location for far away sounds
+ // world.b(1038, blockposition1.b(1, 0, 1), 0);
+ int viewDistance = world.getServer().getViewDistance() * 16;
+ BlockPosition soundPos = blockposition1.b(1, 0, 1);
+ for (EntityPlayer player : world.getServer().getServer().getPlayerList().players) {
+ double deltaX = soundPos.getX() - player.locX();
+ double deltaZ = soundPos.getZ() - player.locZ();
+ double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
+ if (world.spigotConfig.endPortalSoundRadius > 0 && distanceSquared > world.spigotConfig.endPortalSoundRadius * world.spigotConfig.endPortalSoundRadius) continue; // Spigot
+ if (distanceSquared > viewDistance * viewDistance) {
+ double deltaLength = Math.sqrt(distanceSquared);
+ double relativeX = player.locX() + (deltaX / deltaLength) * viewDistance;
+ double relativeZ = player.locZ() + (deltaZ / deltaLength) * viewDistance;
+ player.playerConnection.sendPacket(new PacketPlayOutWorldEvent(1038, new BlockPosition((int) relativeX, (int) soundPos.getY(), (int) relativeZ), 0, true));
+ } else {
+ player.playerConnection.sendPacket(new PacketPlayOutWorldEvent(1038, soundPos, 0, true));
+ }
+ }
+ // CraftBukkit end
}
return EnumInteractionResult.SUCCESS;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 02326721c..0f9d5cb4f 100644
index 02326721c..35d01cbaf 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -251,4 +251,16 @@ public class SpigotWorldConfig
@@ -251,4 +251,22 @@ public class SpigotWorldConfig
enableZombiePigmenPortalSpawns = getBoolean( "enable-zombie-pigmen-portal-spawns", true );
log( "Allow Zombie Pigmen to spawn from portal blocks: " + enableZombiePigmenPortalSpawns );
}
@ -65,8 +96,14 @@ index 02326721c..0f9d5cb4f 100644
+ private void witherSpawnSoundRadius()
+ {
+ witherSpawnSoundRadius = getInt( "wither-spawn-sound-radius", 0 );
+ }
+
+ public int endPortalSoundRadius;
+ private void endPortalSoundRadius()
+ {
+ endPortalSoundRadius = getInt( "end-portal-sound-radius", 0 );
+ }
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0056-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
View file

@ -1,4 +1,4 @@
From 8603a18a1d5b872aedaf91cf2cbb3f885cb41ad7 Mon Sep 17 00:00:00 2001
From 218c6f80dbea66b2720a87f20a4344a1005d9e9f Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 11 Apr 2014 11:16:34 +0100
Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
@ -6,7 +6,7 @@ Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a5d54a49f..d604295ac 100644
index d0ad2fa87..9bb232548 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1301,7 +1301,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -19,5 +19,5 @@ index a5d54a49f..d604295ac 100644
public CrashReport b(CrashReport crashreport) {
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0057-Treat-Bungee-as-Online-Mode.patch
View file

@ -1,4 +1,4 @@
From 2fea8cb6cf6ff4d3737d1412f78ae00e4ef115ba Mon Sep 17 00:00:00 2001
From ce58d919351e067e5d3aa1c27d83d256b6bf6a91 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 21:23:58 +1000
Subject: [PATCH] Treat Bungee as Online Mode
@ -38,5 +38,5 @@ index c6eec9619..c9c2b0025 100644
} else {
String[] astring1 = astring;
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0058-Print-Stack-on-InternalException.patch
View file

@ -1,4 +1,4 @@
From 2119716ee6d7f39a2384c1bfcc7e49200c680872 Mon Sep 17 00:00:00 2001
From 1b7f6e0891ffc780657e6cf4de05837bebc85e83 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 13 Apr 2014 09:00:59 +1000
Subject: [PATCH] Print Stack on InternalException
@ -17,5 +17,5 @@ index 6146b4442..25be87cf4 100644
protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet<?> packet) throws Exception {
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0059-Use-Offline-Player-Data-Once-if-Required.patch
View file

@ -1,4 +1,4 @@
From 03dd055fb0e45fe14263c33bbe3c48f038df7a43 Mon Sep 17 00:00:00 2001
From 4ac5dc39262e4be605d42a3945c82147c9db41c5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 13 Apr 2014 14:41:23 +1000
Subject: [PATCH] Use Offline Player Data Once if Required.
@ -39,5 +39,5 @@ index 1f09bf020..f965ff64b 100644
WorldNBTStorage.LOGGER.warn("Failed to load player data for {}", entityhuman.getDisplayName().getString());
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0060-Use-Provided-Case-for-Non-Existent-Offline-Players.patch
View file

@ -1,4 +1,4 @@
From c598091a508755fda90e41bd7cc00f9d40897a48 Mon Sep 17 00:00:00 2001
From 9b800b00922e80b023ff25efa40da6de3f860742 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 14 Apr 2014 09:46:20 +1000
Subject: [PATCH] Use Provided Case for Non Existent Offline Players
@ -18,5 +18,5 @@ index 5d46cfb8f..c61e08753 100644
this.a(gameprofile);
usercache_usercacheentry = (UserCache.UserCacheEntry) this.d.get(s1);
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0061-Fix-Player-Banning.patch
View file

@ -1,4 +1,4 @@
From 1ad6159c820ac0125c3d56a48fd597fb6e82d89d Mon Sep 17 00:00:00 2001
From bc05478a28f166cbc8aeac0524a8275c2ef3e0d0 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 15 Apr 2014 10:32:48 +1000
Subject: [PATCH] Fix Player Banning
@ -45,5 +45,5 @@ index 0cc701042..120c71766 100644
}
}
--
2.20.1
2.25.1

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

@ -1,11 +1,11 @@
From 24e7888beae84b32fa983dea4c3872f4796f6b46 Mon Sep 17 00:00:00 2001
From 507e99d1c74b61e4fc0c83449a2f283e9b862104 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 16 Apr 2014 11:14:38 +1000
Subject: [PATCH] Correct Ban Expiration
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 3f1c7b24e..c301798c4 100644
index 09d7a0970..8f82b4dce 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -472,7 +472,7 @@ public abstract class PlayerList {
@ -18,5 +18,5 @@ index 3f1c7b24e..c301798c4 100644
chatmessage = new ChatMessage("multiplayer.disconnect.not_whitelisted", new Object[0]);
event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, org.spigotmc.SpigotConfig.whitelistMessage); // Spigot
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0063-Log-null-TileEntity-Owner.patch
View file

@ -1,4 +1,4 @@
From 9aae60c01c7d3304d9258b255421ca865f04a81b Mon Sep 17 00:00:00 2001
From a4ba3c914b1ab92392177038690f8fc98cfd5a1c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 20 Apr 2014 11:16:54 +1000
Subject: [PATCH] Log null TileEntity Owner
@ -25,5 +25,5 @@ index b7175ee6a..40752f761 100644
return null;
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0064-Convert-player-skulls-async.patch
View file

@ -1,4 +1,4 @@
From 236cae2b999e67ccc650e2bd849f4deefedbc882 Mon Sep 17 00:00:00 2001
From 453be3f1188db58bb46216aab82eef8707e0c624 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sun, 20 Apr 2014 13:18:55 +0100
Subject: [PATCH] Convert player skulls async
@ -215,5 +215,5 @@ index bb48da605..a6e95a909 100644
tag.set(SKULL_OWNER.NBT, serializedProfile);
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0065-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
View file

@ -1,4 +1,4 @@
From e7f19d886573cc1b9e8cf3c57b6fe7d520d85661 Mon Sep 17 00:00:00 2001
From ce351bc768e9aaaa9470920d49c88a2f5917b2de 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
@ -61,5 +61,5 @@ index 8b3732202..54fa83c12 100644
log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" );
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0066-Fix-race-condition-that-could-kill-connections-befor.patch
View file

@ -1,4 +1,4 @@
From 783fb0da7a32049a2f6cbe32e49cbed555ebd0c6 Mon Sep 17 00:00:00 2001
From b8b8b61c8bab9ffa5bdc4cc29a03bd05c051a120 Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Fri, 25 Apr 2014 23:46:46 +0200
Subject: [PATCH] Fix race condition that could kill connections before they
@ -59,5 +59,5 @@ index 0ebee9687..e7e216850 100644
networkmanager.handleDisconnection();
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0067-Configurable-UserCache-cap.patch
View file

@ -1,4 +1,4 @@
From 49963a4d1b02c362a8dec145a50a6deff5a16d65 Mon Sep 17 00:00:00 2001
From af3de3c985d288277a70a72802c034795a28cd7b Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Fri, 25 Apr 2014 18:17:30 -0400
Subject: [PATCH] Configurable UserCache cap
@ -33,5 +33,5 @@ index de35b3907..7411fa731 100644
+ }
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0068-Implement-PlayerSpawnLocationEvent.patch
View file

@ -1,11 +1,11 @@
From 1181c6135a3dc50e7cab9e87d8cd26f65ce45021 Mon Sep 17 00:00:00 2001
From a3d5649d73630eb7d5b537a7e7a2974a911691c5 Mon Sep 17 00:00:00 2001
From: ninja <xninja@openmailbox.org>
Date: Tue, 8 Apr 2014 14:05:19 +0200
Subject: [PATCH] Implement PlayerSpawnLocationEvent.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index c301798c4..5786c8bd9 100644
index 8f82b4dce..10a2bce98 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -38,6 +38,7 @@ import org.bukkit.event.player.PlayerQuitEvent;
@ -37,5 +37,5 @@ index c301798c4..5786c8bd9 100644
// PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.locX(), entityplayer.locY(), entityplayer.locZ());
WorldData worlddata = worldserver.getWorldData();
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0069-Configurable-save-on-stop-only-for-UserCache.patch
View file

@ -1,11 +1,11 @@
From b7fab0135b3eee8fe7d022bc1786258f6eddc750 Mon Sep 17 00:00:00 2001
From e40ae8fef00bbe4f2582d176983ae94d3c7e1285 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Fri, 23 May 2014 18:05:10 -0400
Subject: [PATCH] Configurable save-on-stop-only for UserCache
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d604295ac..79b6512cf 100644
index 9bb232548..191542ebf 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -738,6 +738,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -59,5 +59,5 @@ index 7411fa731..865c71821 100644
+ }
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0070-Limit-block-placement-interaction-packets.patch
View file

@ -1,4 +1,4 @@
From f65a11b6da144515bd87943f02a8995b20b76069 Mon Sep 17 00:00:00 2001
From 6cabbea27e8dc7abe64cbdd81d33a263257fcdd8 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sun, 29 Jun 2014 21:10:34 +0100
Subject: [PATCH] Limit block placement/interaction packets
@ -86,5 +86,5 @@ index 780a7ed33..3a138f69d 100644
EnumHand enumhand = packetplayinblockplace.b();
ItemStack itemstack = this.player.b(enumhand);
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0071-Better-item-validation.patch
View file

@ -1,4 +1,4 @@
From c481b995e8481cd4c26b7c2f9bc84f8e747e0142 Mon Sep 17 00:00:00 2001
From f61d3198c03f69f51980a77e7309f7eb1cae3132 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Wed, 2 Jul 2014 23:35:51 +0100
Subject: [PATCH] Better item validation
@ -120,5 +120,5 @@ index 000000000..58a953481
+ }
+}
--
2.20.1
2.25.1

10
CraftBukkit-Patches/0072-Further-Seed-Customisation.patch
View file

@ -1,4 +1,4 @@
From 1516f2a628fb82965db10e549c61705c719ba849 Mon Sep 17 00:00:00 2001
From 2300799b9dc9f42c875b23e04673fc0adf6f2696 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 4 Jul 2014 13:28:45 +1000
Subject: [PATCH] Further Seed Customisation
@ -240,12 +240,12 @@ index 79a0513ac..8feacd61e 100644
+ // Spigot end
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 0f9d5cb4f..ed560ae77 100644
index 35d01cbaf..ea7f4c847 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -263,4 +263,31 @@ public class SpigotWorldConfig
@@ -269,4 +269,31 @@ public class SpigotWorldConfig
{
witherSpawnSoundRadius = getInt( "wither-spawn-sound-radius", 0 );
endPortalSoundRadius = getInt( "end-portal-sound-radius", 0 );
}
+
+ public int villageSeed;
@ -276,5 +276,5 @@ index 0f9d5cb4f..ed560ae77 100644
+ }
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0073-Add-More-Information-to-session.lock-Errors.patch
View file

@ -1,4 +1,4 @@
From cee1493ed1ea6031e5476f941eb3aa2c6af6b7a2 Mon Sep 17 00:00:00 2001
From 3ce9e82a27e388ebf745a97caf85c039c648b695 Mon Sep 17 00:00:00 2001
From: Suddenly <suddenly@suddenly.coffee>
Date: Sat, 5 Jul 2014 16:56:44 +0100
Subject: [PATCH] Add More Information to session.lock Errors
@ -35,5 +35,5 @@ index f965ff64b..97bac7d25 100644
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0074-Safer-JSON-Loading.patch
View file

@ -1,4 +1,4 @@
From f998734368f392e9f8733db5e39bf5395f4617d6 Mon Sep 17 00:00:00 2001
From 6fd55099c14826704d24ad078af42c1daa5ad03d Mon Sep 17 00:00:00 2001
From: Suddenly <suddenly@suddenly.coffee>
Date: Tue, 8 Jul 2014 09:44:18 +1000
Subject: [PATCH] Safer JSON Loading
@ -40,5 +40,5 @@ index a847f74d9..65659996c 100644
;
} finally {
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0075-Add-CommandLine-EULA-Flag.patch
View file

@ -1,4 +1,4 @@
From 34e617298f0a46b212b09045eca907db6cf74e99 Mon Sep 17 00:00:00 2001
From 72ac4fa365641264ec8312a7b88092681b39372d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 9 Jul 2014 10:35:44 +1000
Subject: [PATCH] Add CommandLine EULA Flag
@ -8,7 +8,7 @@ This flag contains the same message as eula.txt (albeit with proper grammar for
This feature only exists for hosting companies and people who manage servers in bulk who wish to agree to the terms by setting a flag in a script.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 79b6512cf..ca94ff318 100644
index 191542ebf..c0371515b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1166,7 +1166,16 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -30,5 +30,5 @@ index 79b6512cf..ca94ff318 100644
return;
}
--
2.20.1
2.25.1

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

@ -1,4 +1,4 @@
From 95667e97952808d1192364b79b97784374b78672 Mon Sep 17 00:00:00 2001
From cc8a3768aeb811a174f1e840b0fb0fa30bcb667b Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Thu, 17 Jul 2014 21:13:15 -0400
Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked
@ -23,5 +23,5 @@ index bd4a84666..b8c5af8be 100644
}
}
--
2.20.1
2.25.1

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

@ -1,11 +1,11 @@
From 146db695192385d942d01986c9a08c15dda11313 Mon Sep 17 00:00:00 2001
From 7098c9db774e3aa0fd8f23e4ce27ab168fbdd934 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 1514a4970..b3f837599 100644
index b3a239c07..e3e947f05 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1490,7 +1490,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -26,5 +26,5 @@ index 1514a4970..b3f837599 100644
@Override
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0078-Make-moved-wrongly-limit-configurable.patch
View file

@ -1,11 +1,11 @@
From fc3df08e165936f81061737e677e105ef298e764 Mon Sep 17 00:00:00 2001
From eecc9efe94a9ba642af1e12b3865e77dd091bdb7 Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Fri, 4 Jul 2014 23:03:13 +0200
Subject: [PATCH] Make "moved wrongly" limit configurable
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5b7cf6258..1ab3ae3cc 100644
index 3a138f69d..e507db624 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -364,7 +364,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -42,5 +42,5 @@ index 865c71821..7a2b8948c 100644
+ }
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0079-Make-moved-too-quickly-limit-configurable.patch
View file

@ -1,11 +1,11 @@
From a16e151dc5d6b5140a2472dc2cd0e2720d194c47 Mon Sep 17 00:00:00 2001
From c8299ea4ba83f011b664a4b4fadb91aebf8e4795 Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Tue, 22 Jul 2014 15:59:01 +0200
Subject: [PATCH] Make "moved too quickly" limit configurable
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 1ab3ae3cc..6e7914216 100644
index e507db624..cb9e64441 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -339,7 +339,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -42,5 +42,5 @@ index 7a2b8948c..5d37f976d 100644
+ }
}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0080-Apply-NBTReadLimiter-to-more-things.patch
View file

@ -1,4 +1,4 @@
From 80cc3e797824b59895a66ae225e0bffd9d58ef56 Mon Sep 17 00:00:00 2001
From 762bfb95ce200963175f9d3835728c27cf9e2f36 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 27 Jul 2014 20:46:04 +1000
Subject: [PATCH] Apply NBTReadLimiter to more things.
@ -67,5 +67,5 @@ index 000000000..8c32e8b62
+ }
+}
--
2.20.1
2.25.1

4
CraftBukkit-Patches/0081-Allow-Attribute-Capping.patch
View file

@ -1,4 +1,4 @@
From 3fe2a6d2f88ef7ad59c4cf9d38f5b48a8dafcf07 Mon Sep 17 00:00:00 2001
From 250a8406ff780f35aa98eb5155dfc06d87bf8dcf Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 28 Jul 2014 16:55:51 +1000
Subject: [PATCH] Allow Attribute Capping.
@ -77,5 +77,5 @@ index 5d37f976d..eb975a3c9 100644
+ }
}
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0082-Only-fetch-an-online-UUID-in-online-mode.patch
View file

@ -1,4 +1,4 @@
From 2a1b618679ec9ff11b34e5119a3db8d0a27cbabe Mon Sep 17 00:00:00 2001
From 6f65a2da803d5513570957e42c2a3be3db087a82 Mon Sep 17 00:00:00 2001
From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
Date: Wed, 30 Jul 2014 01:19:51 +0200
Subject: [PATCH] Only fetch an online UUID in online mode
@ -12,7 +12,7 @@ You want to store data for player "Test" who never joined. An online UUID is cr
The player Test joins with an offline UUID but that will not match the online UUID of the saved data.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index cf8e3b95a..1300f7b73 100644
index 3d955009b..19cdd71d8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1356,8 +1356,14 @@ public final class CraftServer implements Server {
@ -33,5 +33,5 @@ index cf8e3b95a..1300f7b73 100644
// Make an OfflinePlayer using an offline mode UUID since the name has no profile
result = getOfflinePlayer(new GameProfile(UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8)), name));
--
2.20.1
2.25.1

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

@ -1,11 +1,11 @@
From febf4ea4250c460a9f4660d3d95cf4cd94fc2ae5 Mon Sep 17 00:00:00 2001
From 68ab8cb1f8886170ad95e4c60cca35b5f27a4c4b 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
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index baaa0e311..0492e4bc6 100644
index 568f879a6..1c72b5423 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1074,6 +1074,30 @@ public class WorldServer extends World {
@ -40,5 +40,5 @@ index baaa0e311..0492e4bc6 100644
EntityComplexPart[] aentitycomplexpart = ((EntityEnderDragon) entity).eo();
int i = aentitycomplexpart.length;
--
2.20.1
2.25.1

6
CraftBukkit-Patches/0084-Remove-uneeded-validation.patch
View file

@ -1,11 +1,11 @@
From 909cb5769191387bdd4ea7a7445f2fa95001ee8a Mon Sep 17 00:00:00 2001
From 90d074696d36377ce8bb9a634441c3b3446a68f4 Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu>
Date: Fri, 15 Aug 2014 18:11:09 -0400
Subject: [PATCH] Remove uneeded validation
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 63a67ea93..0f901453d 100644
index da149e51f..f1c19d67d 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -302,7 +302,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@ -43,5 +43,5 @@ index 63a67ea93..0f901453d 100644
@Override
--
2.20.1
2.25.1

10
CraftBukkit-Patches/0085-Add-Hunger-Config-Values.patch
View file

@ -1,11 +1,11 @@
From da7ed628746cc950c6789c7b4e58a3b568444365 Mon Sep 17 00:00:00 2001
From 18501219b39617bf006223fd98365ea97d14ab34 Mon Sep 17 00:00:00 2001
From: lazertester <austin.techhead@gmail.com>
Date: Sun, 17 Aug 2014 19:56:17 +1000
Subject: [PATCH] Add Hunger Config Values
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index d18b14369..242129ae4 100644
index cd379826d..1228b73bd 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1199,7 +1199,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -76,10 +76,10 @@ index 4fec836e0..01d702d5c 100644
}
} else if (this.foodLevel <= 0) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index ed560ae77..defdcae52 100644
index ea7f4c847..7bc5a5f85 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -290,4 +290,30 @@ public class SpigotWorldConfig
@@ -296,4 +296,30 @@ public class SpigotWorldConfig
slimeSeed = getInt( "seed-slime", 987234911 );
log( "Custom Map Seeds: Village: " + villageSeed + " Desert: " + desertSeed + " Igloo: " + iglooSeed + " Jungle: " + jungleSeed + " Swamp: " + swampSeed + " Monument: " + monumentSeed + " Ocean: " + oceanSeed + " Shipwreck: " + shipwreckSeed + " End City: " + endCitySeed + " Slime: " + slimeSeed );
}
@ -111,5 +111,5 @@ index ed560ae77..defdcae52 100644
+ }
}
--
2.20.1
2.25.1

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