spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2021-03-04 08:33:04 +11:00
parent 73fb6094f4
commit db99f82161
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
25 changed files with 138 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 0619af6461b117aba67946be808bd4a0d107ee9e Mon Sep 17 00:00:00 2001
From 74f3ae261eb5382294e616bb40c76179bc244c7b 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
@ -37,10 +37,10 @@ index d5aafa0e..afe2047b 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 70d6994e..940f0074 100644
index f36ad196..b115064e 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2339,6 +2339,15 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2348,6 +2348,15 @@ public interface World extends PluginMessageRecipient, Metadatable {
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);
@ -120,10 +120,10 @@ index 76aad05f..4d308c5a 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1d5bfca2..51475116 100644
index 41be187d..798aae7b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1287,4 +1287,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1249,4 +1249,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param book The book to open for this player
*/
public void openBook(@NotNull ItemStack book);

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

@ -1,14 +1,14 @@
From 45bd3588f3f5f8f57f4cd9ec299390a4d1873525 Mon Sep 17 00:00:00 2001
From 1a6496827fff8013e88b6677f052ed8120accc6a 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 51475116..f6e6c06b 100644
index 798aae7b..63310288 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1291,6 +1291,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1253,6 +1253,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Spigot start
public class Spigot extends Entity.Spigot {

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

@ -1,14 +1,14 @@
From d44bf20c8f52af812a47eabc4ec6acfa842555a6 Mon Sep 17 00:00:00 2001
From c0812386252ed7ff38d5340959b6e34b1f021744 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 f6e6c06b..347d5d0c 100644
index 63310288..bf492cc0 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1301,6 +1301,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1263,6 +1263,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public InetSocketAddress getRawAddress() {
throw new UnsupportedOperationException("Not supported yet.");
}

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

@ -1,14 +1,14 @@
From d49cb526e269f94e9ecff91ab89ced24c2a7fb31 Mon Sep 17 00:00:00 2001
From af8194743edc3f64f6bcd2ecd695bbf298600a82 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 347d5d0c..2d5569a4 100644
index bf492cc0..f99af3d0 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1324,6 +1324,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1286,6 +1286,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void setCollidesWithEntities(boolean collides) {
throw new UnsupportedOperationException("Not supported yet.");
}

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

@ -1,14 +1,14 @@
From 9335c5783ad96bc509a3b39add57923110af853b Mon Sep 17 00:00:00 2001
From a17729cb900b95ebf1ea96550147fb36228d0a8b 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 2d5569a4..b11e81e3 100644
index f99af3d0..c81cee7c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1331,6 +1331,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1293,6 +1293,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void respawn() {
throw new UnsupportedOperationException("Not supported yet.");
}

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

@ -1,14 +1,14 @@
From b413b20e8b321f6d4aad5cd9a11734f5d91b234e Mon Sep 17 00:00:00 2001
From f735b9d635eab8d49ab19e42e0ff6d0030441ac2 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 940f0074..7c524fba 100644
index b115064e..08f0c754 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2342,6 +2342,29 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2351,6 +2351,29 @@ public interface World extends PluginMessageRecipient, Metadatable {
// Spigot start
public class Spigot {

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

@ -1,14 +1,14 @@
From 142a9853415667a7f7618841f2ead790744da90f Mon Sep 17 00:00:00 2001
From 7ddf82de16e2f1c76bc4105c7ae24f40aa19775f 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 b11e81e3..a00880dd 100644
index c81cee7c..b95a2c8a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -484,10 +484,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -495,10 +495,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Forces an update of the player's entire inventory.
*

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

@ -1,4 +1,4 @@
From 0b92508fd7d06757235e960f36585ac62ce0e1df Mon Sep 17 00:00:00 2001
From 137ecc63b64d5a14807a6de5d10af309f5b4a5e0 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
@ -370,7 +370,7 @@ index 6d9708dc..ac772bf3 100644
@NotNull
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index a00880dd..40345617 100644
index b95a2c8a..90c8c3eb 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1,6 +1,7 @@
@ -381,7 +381,7 @@ index a00880dd..40345617 100644
import org.bukkit.DyeColor;
import org.bukkit.Effect;
import org.bukkit.GameMode;
@@ -1339,6 +1340,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1301,6 +1302,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public java.util.Set<Player> getHiddenPlayers() {
throw new UnsupportedOperationException("Not supported yet.");
}

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

@ -1,4 +1,4 @@
From 92f113e6f01675f06f1d4fc18e73ecb26c709e80 Mon Sep 17 00:00:00 2001
From 569eb0600ef67c466618115a861ec197f367bd86 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
@ -6,10 +6,10 @@ Subject: [PATCH] View Distance
This commit allows the retrieval of per world view distances.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 7c524fba..cdcbc8b0 100644
index 08f0c754..b8a33ac5 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2339,6 +2339,15 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2348,6 +2348,15 @@ public interface World extends PluginMessageRecipient, Metadatable {
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);

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

@ -1,4 +1,4 @@
From 86df25939becc2b90ad1862b7c7e1212a1a6b94d Mon Sep 17 00:00:00 2001
From 6ab8f465f6f5d78fa10f88a68dbf4c64d38fa786 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
@ -27,10 +27,10 @@ index c732c4e8e..51e291bf2 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 39009e61d..c902748cc 100644
index d9dd324c9..87011e92d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2328,4 +2328,15 @@ public class CraftWorld implements World {
@@ -2333,4 +2333,15 @@ public class CraftWorld implements World {
public DragonBattle getEnderDragonBattle() {
return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle());
}
@ -124,10 +124,10 @@ index 6c05cb414..e7e7d738e 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 b6b9ffc77..e8df8fed7 100644
index 31877a21c..b8c59bd46 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1716,4 +1716,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1699,4 +1699,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().openBook(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(book), net.minecraft.server.EnumHand.MAIN_HAND);
getInventory().setItemInMainHand(hand);
}

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

@ -1,4 +1,4 @@
From 784699cf4f6002c7739455053a17f7e9ace0c655 Mon Sep 17 00:00:00 2001
From 74456de9ba3f18775d19fd4f9b4c191b05fefcf5 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 e1475356a..244256f3a 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 c1f361d79..7447fd88e 100644
index 61d406b2c..b43f9a0d7 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -569,6 +569,23 @@ public class CraftEventFactory {
@@ -570,6 +570,23 @@ public class CraftEventFactory {
event = CraftEventFactory.callProjectileLaunchEvent(entity);
} else if (entity.getBukkitEntity() instanceof org.bukkit.entity.Vehicle) {
event = CraftEventFactory.callVehicleCreateEvent(entity);

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

@ -1,4 +1,4 @@
From 2aa0ec5ac2659044ad447f8979b32e1278348b2c Mon Sep 17 00:00:00 2001
From 2abaafa7eaf774a3331297cd13bee5dd75b4c081 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
@ -6,7 +6,7 @@ Subject: [PATCH] Async Operation Catching
Catch and throw an exception when a potentially unsafe operation occurs on a thread other than the main server thread.
diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
index 753bdb7e..f28b9c09 100644
index 753bdb7ea..f28b9c093 100644
--- a/src/main/java/net/minecraft/server/BlockBase.java
+++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -69,10 +69,13 @@ public abstract class BlockBase {
@ -25,7 +25,7 @@ index 753bdb7e..f28b9c09 100644
world.removeTileEntity(blockposition);
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index f0954d03..2c952e2d 100644
index f0954d038..2c952e2de 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -333,6 +333,7 @@ public class Chunk implements IChunkAccess {
@ -69,7 +69,7 @@ index f0954d03..2c952e2d 100644
int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D);
diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java
index f9762de9..fdb7d96c 100644
index f9762de90..fdb7d96cf 100644
--- a/src/main/java/net/minecraft/server/CraftingManager.java
+++ b/src/main/java/net/minecraft/server/CraftingManager.java
@@ -71,6 +71,7 @@ public class CraftingManager extends ResourceDataJson {
@ -81,7 +81,7 @@ index f9762de9..fdb7d96c 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 fd9f4689..295cbb5e 100644
index e30ae3c79..4e8e59a2b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -889,6 +889,7 @@ public abstract class EntityLiving extends Entity {
@ -93,7 +93,7 @@ index fd9f4689..295cbb5e 100644
effectsToProcess.add(new ProcessableEffect(mobeffect, cause));
return true;
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index be6d3548..b9e44767 100644
index be6d35487..b9e44767e 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1005,6 +1005,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -129,7 +129,7 @@ index be6d3548..b9e44767 100644
Vec3D vec3d = entityplayer.getPositionVector().d(this.tracker.getPositionVector()); // MC-155077, SPIGOT-5113
int i = Math.min(this.b(), (PlayerChunkMap.this.viewDistance - 1) * 16);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 46fc05b9..bd154420 100644
index 75e8db2a6..5049bed1a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -887,6 +887,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -157,7 +157,7 @@ index 46fc05b9..bd154420 100644
this.entitiesToAdd.add(entity);
} else {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e3fa6ead..27b4683a 100644
index e3fa6eadd..27b4683a2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -737,6 +737,7 @@ public final class CraftServer implements Server {
@ -169,7 +169,7 @@ index e3fa6ead..27b4683a 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 c902748c..3584690a 100644
index 87011e92d..5be3d403f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -388,6 +388,7 @@ public class CraftWorld implements World {
@ -204,7 +204,7 @@ index c902748c..3584690a 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.
@@ -1087,6 +1091,7 @@ public class CraftWorld implements World {
@@ -1092,6 +1096,7 @@ public class CraftWorld implements World {
@Override
public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<Entity> filter) {
@ -212,7 +212,7 @@ index c902748c..3584690a 100644
Validate.notNull(boundingBox, "Bounding box is null!");
AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
@@ -1241,6 +1246,7 @@ public class CraftWorld implements World {
@@ -1246,6 +1251,7 @@ public class CraftWorld implements World {
@Override
public void save() {
@ -221,7 +221,7 @@ index c902748c..3584690a 100644
boolean oldSave = world.savingDisabled;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 07777994..b677f8a7 100644
index 077779944..b677f8a7e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -512,6 +512,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -233,10 +233,10 @@ index 07777994..b677f8a7 100644
List<org.bukkit.entity.Entity> bukkitEntityList = new java.util.ArrayList<org.bukkit.entity.Entity>(notchEntityList.size());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e8df8fed..d65f88b3 100644
index b8c59bd46..a77c16644 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -326,6 +326,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -327,6 +327,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {
@ -245,7 +245,7 @@ index e8df8fed..d65f88b3 100644
getHandle().playerConnection.disconnect(message == null ? "" : message);
diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
index fd9949e1..ca2be306 100644
index fd9949e1e..ca2be3060 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
@@ -41,6 +41,7 @@ public final class CraftScoreboardManager implements ScoreboardManager {
@ -257,7 +257,7 @@ index fd9949e1..ca2be306 100644
scoreboards.add(scoreboard);
return scoreboard;
diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
index 2e057fd4..ddef523e 100644
index 2e057fd4c..ddef523ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
@@ -12,6 +12,7 @@ public class ServerShutdownThread extends Thread {
@ -270,7 +270,7 @@ index 2e057fd4..ddef523e 100644
try {
diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
new file mode 100644
index 00000000..aeed7697
index 000000000..aeed76972
--- /dev/null
+++ b/src/main/java/org/spigotmc/AsyncCatcher.java
@@ -0,0 +1,17 @@
@ -292,5 +292,5 @@ index 00000000..aeed7697
+ }
+}
--
2.30.0.windows.2
2.25.1

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

@ -1,4 +1,4 @@
From 7ecb14c5c6746bed3afb4d4e6ce2877b6ea914a8 Mon Sep 17 00:00:00 2001
From f1455852de9b6eb18d151427884fb6274d777047 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
@ -28,7 +28,7 @@ index 2f8afe9f9..ef01156b7 100644
entityplayer1.dead = false;
entityplayer1.playerConnection.teleport(new Location(worldserver1.getWorld(), entityplayer1.locX(), entityplayer1.locY(), entityplayer1.locZ(), entityplayer1.yaw, entityplayer1.pitch));
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index bd154420a..9e1065e59 100644
index 5049bed1a..ecff876d7 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -114,7 +114,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -41,10 +41,10 @@ index bd154420a..9e1065e59 100644
});
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 3584690ad..2cd8ce4f2 100644
index 5be3d403f..4407a512c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2335,6 +2335,13 @@ public class CraftWorld implements World {
@@ -2340,6 +2340,13 @@ public class CraftWorld implements World {
return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle());
}

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

@ -1,4 +1,4 @@
From 6fa504d0af39f5806ae64bdc4c36b07ace291839 Mon Sep 17 00:00:00 2001
From 8568fc2b9e771d97145d1d8ab20c43332d62c2a9 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
@ -6,10 +6,10 @@ Subject: [PATCH] Spigot Timings
Overhauls the Timings System adding performance tracking all around the Minecraft Server
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 981414374..d3386c108 100644
index 361535428..78b264a13 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -115,9 +115,11 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -123,9 +123,11 @@ public class ChunkProviderServer extends IChunkProvider {
}
gameprofilerfiller.c("getChunkCacheMiss");
@ -21,7 +21,7 @@ index 981414374..d3386c108 100644
ichunkaccess = (IChunkAccess) ((Either) completablefuture.join()).map((ichunkaccess1) -> {
return ichunkaccess1;
}, (playerchunk_failure) -> {
@@ -336,12 +338,16 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -344,12 +346,16 @@ public class ChunkProviderServer extends IChunkProvider {
public void tick(BooleanSupplier booleansupplier) {
this.world.getMethodProfiler().enter("purge");
@ -38,7 +38,7 @@ index 981414374..d3386c108 100644
this.world.getMethodProfiler().exit();
this.clearCache();
}
@@ -388,7 +394,9 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -396,7 +402,9 @@ public class ChunkProviderServer extends IChunkProvider {
SpawnerCreature.a(this.world, chunk, spawnercreature_d, this.allowAnimals, this.allowMonsters, flag2);
}
@ -48,7 +48,7 @@ index 981414374..d3386c108 100644
}
}
}
@@ -402,7 +410,9 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -410,7 +418,9 @@ public class ChunkProviderServer extends IChunkProvider {
this.world.getMethodProfiler().exit();
}
@ -116,7 +116,7 @@ index 80bfb9e8f..2a63e517b 100644
@Override
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 78e69649a..e8b64438b 100644
index ce250b964..6182670bf 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -31,6 +31,7 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@ -152,7 +152,7 @@ index 78e69649a..e8b64438b 100644
protected BlockPosition ap() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 295cbb5e7..cb164698f 100644
index 4e8e59a2b..7eeeb7dfa 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -42,6 +42,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -498,7 +498,7 @@ index 30b817246..61351ca6a 100644
CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 9e1065e59..683b76ae3 100644
index ecff876d7..f30161f51 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -43,6 +43,7 @@ import org.apache.logging.log4j.Logger;

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

@ -1,4 +1,4 @@
From ff08947934829a9b9cbebbb58911a2d63057784f Mon Sep 17 00:00:00 2001
From 6e86fc0d3f80900e2e20addd98274056c0c28c37 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
@ -8,10 +8,10 @@ Changes the mob spawning algorithm to properly account for view distance and the
Needs better documentation.
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index d3386c108..49cfd12dd 100644
index 78b264a13..d1051f059 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -390,7 +390,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -398,7 +398,7 @@ public class ChunkProviderServer extends IChunkProvider {
if (!this.playerChunkMap.isOutsideOfRange(chunkcoordintpair)) {
chunk.setInhabitedTime(chunk.getInhabitedTime() + j);

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

@ -1,14 +1,14 @@
From 21fcb75dade45baa75d3b28b8235eb9be39dfc6f Mon Sep 17 00:00:00 2001
From 3635ca5cdef59cf4d2e17ce83374601cea0077d6 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 d65f88b34..e9a7677e1 100644
index a77c16644..51d3127f7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1721,6 +1721,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1704,6 +1704,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

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

@ -1,14 +1,14 @@
From 58c26ff7c87b059b08a999de3063a77f5f2e66c7 Mon Sep 17 00:00:00 2001
From 015101a20818a3cfde9ceaa4ee3ff03a57c95b77 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 e9a7677e1..815e12697 100644
index 51d3127f7..f6dacf8c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1731,6 +1731,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1714,6 +1714,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setCollidesWithEntities(boolean collides) {
CraftPlayer.this.setCollidable(collides);
}

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

@ -1,4 +1,4 @@
From 80e9dd60a97aa7909828451550e0ceb94fc08eff Mon Sep 17 00:00:00 2001
From bf6dd62138329f9b89cae75c2fbe395c5b80b2ea 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
@ -128,7 +128,7 @@ index ab788d175..7faf56ffd 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 ccae35d27..8d15d13e1 100644
index e9a4c9b19..11caafded 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -660,7 +660,13 @@ public final class CraftServer implements Server {
@ -147,10 +147,10 @@ index ccae35d27..8d15d13e1 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 815e12697..bbfe544d0 100644
index f6dacf8c8..81eb0fffc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1722,6 +1722,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1705,6 +1705,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private final Player.Spigot spigot = new Player.Spigot()
{

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

@ -1,14 +1,14 @@
From e6dae891010d2344af54a47d87f49aa1102f9834 Mon Sep 17 00:00:00 2001
From f8d733dac61a2bfbad28bc4deb513f4ddbf24f98 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 bbfe544d0..7e0ae0bbb 100644
index 81eb0fffc..831afaa20 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1490,7 +1490,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1473,7 +1473,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {

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

@ -1,14 +1,14 @@
From 463b4329fc78df6f8bff9723c425fb4618d6182a Mon Sep 17 00:00:00 2001
From cf15a6e830fa30f8a7f80a3fd5f43419bd14c872 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 7e0ae0bbb..b5f324631 100644
index 831afaa20..bde254e04 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1746,6 +1746,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1729,6 +1729,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), false );
}
}

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

@ -1,11 +1,11 @@
From 4bb026b080a1493bb4b28b17d983ce617cfdb35a Mon Sep 17 00:00:00 2001
From f62d2bcdd8a9b01b6ee15433de5fa2739ede5d18 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
diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
index 44cdcaba..7d9e3b63 100644
index 44cdcaba7..7d9e3b636 100644
--- a/src/main/java/net/minecraft/server/EntityLightning.java
+++ b/src/main/java/net/minecraft/server/EntityLightning.java
@@ -15,6 +15,7 @@ public class EntityLightning extends Entity {
@ -26,10 +26,10 @@ index 44cdcaba..7d9e3b63 100644
if (enumdifficulty == EnumDifficulty.NORMAL || enumdifficulty == EnumDifficulty.HARD) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 9738b6f0..4cf87080 100644
index 4407a512c..539bc756b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2345,6 +2345,26 @@ public class CraftWorld implements World {
@@ -2350,6 +2350,26 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{
@ -57,7 +57,7 @@ index 9738b6f0..4cf87080 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
index e7e7d738..988386a9 100644
index e7e7d738e..988386a9a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
@@ -33,6 +33,11 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike

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

@ -1,14 +1,14 @@
From 783480d1c6afe87bc803a58473abd08eb006380b Mon Sep 17 00:00:00 2001
From 5aea4ec5007dc6c1efb289dcabab761ad50148e5 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 b5f324631..93d947733 100644
index bde254e04..c99822c2b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1571,7 +1571,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1554,7 +1554,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> { });

63
CraftBukkit-Patches/0082-Add-Hunger-Config-Values.patch
View file

@ -1,77 +1,84 @@
From 375a26beb2eab34b82a24a3669250622ff9de916 Mon Sep 17 00:00:00 2001
From bc2bdf1af07fb6b5393565c900dbee02501ff1be 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 043aedae3..a85daaef5 100644
index c25e1322f..1a4f49a01 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1180,7 +1180,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1182,7 +1182,7 @@ public abstract class EntityHuman extends EntityLiving {
}
}
- this.applyExhaustion(0.1F);
+ this.applyExhaustion(world.spigotConfig.combatExhaustion); // Spigot - Change to use configurable value
- this.applyExhaustion(0.1F, EntityExhaustionEvent.ExhaustionReason.ATTACK); // CraftBukkit - EntityExhaustionEvent
+ this.applyExhaustion(world.spigotConfig.combatExhaustion, EntityExhaustionEvent.ExhaustionReason.ATTACK); // CraftBukkit - EntityExhaustionEvent // Spigot - Change to use configurable value
} else {
this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_PLAYER_ATTACK_NODAMAGE, this.getSoundCategory(), 1.0F, 1.0F);
if (flag4) {
@@ -1341,9 +1341,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1343,9 +1343,9 @@ public abstract class EntityHuman extends EntityLiving {
super.jump();
this.a(StatisticList.JUMP);
if (this.isSprinting()) {
- this.applyExhaustion(0.2F);
+ this.applyExhaustion(world.spigotConfig.jumpSprintExhaustion); // Spigot - Change to use configurable value
- this.applyExhaustion(0.2F, EntityExhaustionEvent.ExhaustionReason.JUMP_SPRINT); // CraftBukkit - EntityExhaustionEvent
+ this.applyExhaustion(world.spigotConfig.jumpSprintExhaustion, EntityExhaustionEvent.ExhaustionReason.JUMP_SPRINT); // CraftBukkit - EntityExhaustionEvent // Spigot - Change to use configurable value
} else {
- this.applyExhaustion(0.05F);
+ this.applyExhaustion(world.spigotConfig.jumpWalkExhaustion); // Spigot - Change to use configurable value
- this.applyExhaustion(0.05F, EntityExhaustionEvent.ExhaustionReason.JUMP); // CraftBukkit - EntityExhaustionEvent
+ this.applyExhaustion(world.spigotConfig.jumpWalkExhaustion, EntityExhaustionEvent.ExhaustionReason.JUMP); // CraftBukkit - EntityExhaustionEvent // Spigot - Change to use configurable value
}
}
@@ -1422,13 +1422,13 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1418,19 +1418,19 @@ public abstract class EntityHuman extends EntityLiving {
i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F);
if (i > 0) {
this.a(StatisticList.SWIM_ONE_CM, i);
- this.applyExhaustion(0.01F * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.SWIM); // CraftBukkit - EntityExhaustionEvent
+ this.applyExhaustion(world.spigotConfig.swimMultiplier * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.SWIM); // CraftBukkit - EntityExhaustionEvent // Spigot
}
} else if (this.a((Tag) TagsFluid.WATER)) {
i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F);
if (i > 0) {
this.a(StatisticList.WALK_UNDER_WATER_ONE_CM, i);
- this.applyExhaustion(0.01F * (float) i * 0.01F);
+ this.applyExhaustion(world.spigotConfig.swimMultiplier * (float) i * 0.01F); // Spigot
- this.applyExhaustion(0.01F * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.WALK_UNDERWATER); // CraftBukkit - EntityExhaustionEvent
+ this.applyExhaustion(world.spigotConfig.swimMultiplier * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.WALK_UNDERWATER); // CraftBukkit - EntityExhaustionEvent // Spigot
}
} else if (this.isInWater()) {
i = Math.round(MathHelper.sqrt(d0 * d0 + d2 * d2) * 100.0F);
if (i > 0) {
this.a(StatisticList.WALK_ON_WATER_ONE_CM, i);
- this.applyExhaustion(0.01F * (float) i * 0.01F);
+ this.applyExhaustion(world.spigotConfig.swimMultiplier * (float) i * 0.01F); // Spigot
- this.applyExhaustion(0.01F * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.WALK_ON_WATER); // CraftBukkit - EntityExhaustionEvent
+ this.applyExhaustion(world.spigotConfig.swimMultiplier * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.WALK_ON_WATER); // CraftBukkit - EntityExhaustionEvent // Spigot
}
} else if (this.isClimbing()) {
if (d1 > 0.0D) {
@@ -1439,13 +1439,13 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1441,13 +1441,13 @@ public abstract class EntityHuman extends EntityLiving {
if (i > 0) {
if (this.isSprinting()) {
this.a(StatisticList.SPRINT_ONE_CM, i);
- this.applyExhaustion(0.1F * (float) i * 0.01F);
+ this.applyExhaustion(world.spigotConfig.sprintMultiplier * (float) i * 0.01F); // Spigot
- this.applyExhaustion(0.1F * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.SPRINT); // CraftBukkit - EntityExhaustionEvent
+ this.applyExhaustion(world.spigotConfig.sprintMultiplier * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.SPRINT); // CraftBukkit - EntityExhaustionEvent // Spigot
} else if (this.bz()) {
this.a(StatisticList.CROUCH_ONE_CM, i);
- this.applyExhaustion(0.0F * (float) i * 0.01F);
+ this.applyExhaustion(world.spigotConfig.otherMultiplier * (float) i * 0.01F); // Spigot
- this.applyExhaustion(0.0F * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.CROUCH); // CraftBukkit - EntityExhaustionEvent
+ this.applyExhaustion(world.spigotConfig.otherMultiplier * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.CROUCH); // CraftBukkit - EntityExhaustionEvent // Spigot
} else {
this.a(StatisticList.WALK_ONE_CM, i);
- this.applyExhaustion(0.0F * (float) i * 0.01F);
+ this.applyExhaustion(world.spigotConfig.otherMultiplier * (float) i * 0.01F); // Spigot
- this.applyExhaustion(0.0F * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.WALK); // CraftBukkit - EntityExhaustionEvent
+ this.applyExhaustion(world.spigotConfig.otherMultiplier * (float) i * 0.01F, EntityExhaustionEvent.ExhaustionReason.WALK); // CraftBukkit - EntityExhaustionEvent // Spigot
}
}
} else if (this.isGliding()) {
diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
index 9e9abc3eb..2476e48fb 100644
index 7ec6e9e82..f40b67c8b 100644
--- a/src/main/java/net/minecraft/server/FoodMetaData.java
+++ b/src/main/java/net/minecraft/server/FoodMetaData.java
@@ -77,7 +77,7 @@ public class FoodMetaData {
++this.foodTickTimer;
if (this.foodTickTimer >= 80) {
@@ -84,7 +84,7 @@ public class FoodMetaData {
if (this.foodTickTimer >= this.unsaturatedRegenRate) { // CraftBukkit - add regen rate manipulation
entityhuman.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); // CraftBukkit - added RegainReason
- this.a(6.0F);
+ this.a(entityhuman.world.spigotConfig.regenExhaustion); // Spigot - Change to use configurable value
// this.a(6.0F); CraftBukkit - EntityExhaustionEvent
- entityhuman.applyExhaustion(6.0f, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.REGEN); // CraftBukkit - EntityExhaustionEvent
+ entityhuman.applyExhaustion(entityhuman.world.spigotConfig.regenExhaustion, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.REGEN); // CraftBukkit - EntityExhaustionEvent // Spigot - Change to use configurable value
this.foodTickTimer = 0;
}
} else if (this.foodLevel <= 0) {

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

@ -1,4 +1,4 @@
From 07bb6d8efcc82030f100dda8da722faf94ef1e9a Mon Sep 17 00:00:00 2001
From 55fa1d5cf57fd8a899429daa4aa3d487b080b5d6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
@ -139,10 +139,10 @@ index 00ab6ab9f..2770441b1 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 93d947733..6ebcf2afe 100644
index c99822c2b..4ffc8442d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -121,6 +121,8 @@ import org.bukkit.plugin.Plugin;
@@ -122,6 +122,8 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.messaging.StandardMessenger;
import org.bukkit.scoreboard.Scoreboard;
@ -151,7 +151,7 @@ index 93d947733..6ebcf2afe 100644
@DelegateDeserialization(CraftOfflinePlayer.class)
public class CraftPlayer extends CraftHumanEntity implements Player {
private long firstPlayed = 0;
@@ -1766,6 +1768,58 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1749,6 +1751,58 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}

8
CraftBukkit-Patches/0091-Implement-SpawnerSpawnEvent.patch
View file

@ -1,4 +1,4 @@
From fd1e59f4d65ee6b3191351767ede687b33809061 Mon Sep 17 00:00:00 2001
From 6f2966a55b8403d18deb1943a1fd33dde5827958 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 3 Mar 2016 19:45:46 +1100
Subject: [PATCH] Implement SpawnerSpawnEvent.
@ -28,10 +28,10 @@ index 571a8fa5a..90af43930 100644
if (!worldserver.addAllEntitiesSafely(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER)) { // CraftBukkit
this.i();
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 7447fd88e..f6688c715 100644
index b43f9a0d7..de912d8f5 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -216,6 +216,8 @@ import org.bukkit.inventory.InventoryView;
@@ -217,6 +217,8 @@ import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.potion.PotionEffect;
@ -40,7 +40,7 @@ index 7447fd88e..f6688c715 100644
public class CraftEventFactory {
public static final DamageSource MELTING = CraftDamageSource.copyOf(DamageSource.BURN);
public static final DamageSource POISON = CraftDamageSource.copyOf(DamageSource.MAGIC);
@@ -1398,6 +1400,21 @@ public class CraftEventFactory {
@@ -1399,6 +1401,21 @@ public class CraftEventFactory {
return event;
}