diff --git a/base/.upstream-state b/base/.upstream-state index 7d199d5..cfbb3e2 100644 --- a/base/.upstream-state +++ b/base/.upstream-state @@ -1 +1 @@ -1.8.8--e15f1f1620c3221075e1591cf24d4dab27edf78a +1.8.8--2882919d66fc3bf050fe2a1474393750d281fa07 diff --git a/patches/api/0002-Add-methods-for-working-with-locales-translations-an.patch b/patches/api/0002-Add-methods-for-working-with-locales-translations-an.patch index 929fd43..d439607 100644 --- a/patches/api/0002-Add-methods-for-working-with-locales-translations-an.patch +++ b/patches/api/0002-Add-methods-for-working-with-locales-translations-an.patch @@ -1,15 +1,15 @@ -From 70399363a9c1da48afec5a9316b04633bc76422e Mon Sep 17 00:00:00 2001 +From b70a6077867e0eecbdf59519c68cb0dc9667ddd6 Mon Sep 17 00:00:00 2001 From: kashike Date: Sat, 17 Dec 2016 02:30:37 -0800 Subject: [PATCH] Add methods for working with locales/translations, and add methods to send components based on type --- - .../text/translation/TranslatableComponent.java | 19 ++++++++++ - src/main/java/org/bukkit/Bukkit.java | 12 +++++++ - src/main/java/org/bukkit/Server.java | 13 +++++++ - .../java/org/bukkit/command/CommandSender.java | 40 ++++++++++++++++++++++ - src/main/java/org/bukkit/entity/Player.java | 28 +++++++++++++++ + .../translation/TranslatableComponent.java | 19 +++++++++ + src/main/java/org/bukkit/Bukkit.java | 12 ++++++ + src/main/java/org/bukkit/Server.java | 13 ++++++ + .../org/bukkit/command/CommandSender.java | 40 +++++++++++++++++++ + src/main/java/org/bukkit/entity/Player.java | 28 +++++++++++++ 5 files changed, 112 insertions(+) create mode 100644 src/main/java/net/avicus/magnet/api/text/translation/TranslatableComponent.java @@ -182,5 +182,5 @@ index d02fe560..4282f2e2 100644 + // Magnet end } -- -2.11.0 +2.23.0 diff --git a/patches/api/0003-Add-BlockFallEvent.patch b/patches/api/0003-Add-BlockFallEvent.patch index 440f43e..c7e3dff 100644 --- a/patches/api/0003-Add-BlockFallEvent.patch +++ b/patches/api/0003-Add-BlockFallEvent.patch @@ -1,16 +1,16 @@ -From 06c75ddd40114e0c22cf091debce329c7e18e7e5 Mon Sep 17 00:00:00 2001 +From d3d0f9be46066c665da860175dee4ece4082e673 Mon Sep 17 00:00:00 2001 From: YukonAppleGeek Date: Tue, 27 Dec 2016 02:30:37 -0800 Subject: [PATCH] Add BlockFallEvent --- - .../org/bukkit/event/block/BlockFallEvent.java | 39 ++++++++++++++++++++++ + .../bukkit/event/block/BlockFallEvent.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/main/java/org/bukkit/event/block/BlockFallEvent.java diff --git a/src/main/java/org/bukkit/event/block/BlockFallEvent.java b/src/main/java/org/bukkit/event/block/BlockFallEvent.java new file mode 100644 -index 0000000..f1f4e84 +index 00000000..f1f4e849 --- /dev/null +++ b/src/main/java/org/bukkit/event/block/BlockFallEvent.java @@ -0,0 +1,39 @@ @@ -54,5 +54,5 @@ index 0000000..f1f4e84 + +} -- -2.6.4 +2.23.0 diff --git a/patches/api/0004-Add-onGround-API.patch b/patches/api/0004-Add-onGround-API.patch index 11acc67..9bb30d2 100644 --- a/patches/api/0004-Add-onGround-API.patch +++ b/patches/api/0004-Add-onGround-API.patch @@ -1,16 +1,16 @@ -From ed206b115a9d5a549628a2b6cdc5225c83fc9fcf Mon Sep 17 00:00:00 2001 +From 549cae0649cbef637360f805395c00ddb73dcc38 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 25 Dec 2016 02:30:37 -0800 Subject: [PATCH] Add onGround API --- - .../bukkit/event/player/PlayerOnGroundEvent.java | 32 ++++++++++++++++++++++ + .../event/player/PlayerOnGroundEvent.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/main/java/org/bukkit/event/player/PlayerOnGroundEvent.java diff --git a/src/main/java/org/bukkit/event/player/PlayerOnGroundEvent.java b/src/main/java/org/bukkit/event/player/PlayerOnGroundEvent.java new file mode 100644 -index 0000000..4a6c3d4 +index 00000000..4a6c3d4b --- /dev/null +++ b/src/main/java/org/bukkit/event/player/PlayerOnGroundEvent.java @@ -0,0 +1,32 @@ @@ -47,5 +47,5 @@ index 0000000..4a6c3d4 + +} -- -2.6.4 +2.23.0 diff --git a/patches/api/0005-Add-PlayerSpawnEntityEvent.patch b/patches/api/0005-Add-PlayerSpawnEntityEvent.patch index 5cc6def..1bbe1c3 100644 --- a/patches/api/0005-Add-PlayerSpawnEntityEvent.patch +++ b/patches/api/0005-Add-PlayerSpawnEntityEvent.patch @@ -1,16 +1,16 @@ -From 34a5e0a2e1ba271cdacfce70af863f16e19a9f1f Mon Sep 17 00:00:00 2001 +From 6adbb4722dc9ed8e6f53d4c88f52e37d604af92e Mon Sep 17 00:00:00 2001 From: YukonAppleGeek Date: Mon, 26 Dec 2016 02:30:37 -0800 Subject: [PATCH] Add PlayerSpawnEntityEvent --- - .../event/player/PlayerSpawnEntityEvent.java | 78 ++++++++++++++++++++++ + .../event/player/PlayerSpawnEntityEvent.java | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 src/main/java/org/bukkit/event/player/PlayerSpawnEntityEvent.java diff --git a/src/main/java/org/bukkit/event/player/PlayerSpawnEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerSpawnEntityEvent.java new file mode 100644 -index 0000000..1fdc6ca +index 00000000..1fdc6cad --- /dev/null +++ b/src/main/java/org/bukkit/event/player/PlayerSpawnEntityEvent.java @@ -0,0 +1,78 @@ @@ -93,5 +93,5 @@ index 0000000..1fdc6ca + } +} -- -2.6.4 +2.23.0 diff --git a/patches/api/0006-Add-EntityDespawnInVoidEvent.patch b/patches/api/0006-Add-EntityDespawnInVoidEvent.patch index e6c3928..952f2d4 100644 --- a/patches/api/0006-Add-EntityDespawnInVoidEvent.patch +++ b/patches/api/0006-Add-EntityDespawnInVoidEvent.patch @@ -1,16 +1,16 @@ -From 947aa696d1c43a4462ad94ec903ec8e2c1dfc672 Mon Sep 17 00:00:00 2001 +From 6bd227bdff35e74e9911eebd570000af944f66b0 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Sun, 25 Dec 2016 02:30:37 -0800 Subject: [PATCH] Add EntityDespawnInVoidEvent --- - .../event/entity/EntityDespawnInVoidEvent.java | 25 ++++++++++++++++++++++ + .../entity/EntityDespawnInVoidEvent.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/main/java/org/bukkit/event/entity/EntityDespawnInVoidEvent.java diff --git a/src/main/java/org/bukkit/event/entity/EntityDespawnInVoidEvent.java b/src/main/java/org/bukkit/event/entity/EntityDespawnInVoidEvent.java new file mode 100644 -index 0000000..f413467 +index 00000000..f413467b --- /dev/null +++ b/src/main/java/org/bukkit/event/entity/EntityDespawnInVoidEvent.java @@ -0,0 +1,25 @@ @@ -40,5 +40,5 @@ index 0000000..f413467 + } +} -- -2.6.4 +2.23.0 diff --git a/patches/api/0008-EventException-knows-the-source-Event.patch b/patches/api/0008-EventException-knows-the-source-Event.patch index c681e60..434315f 100644 --- a/patches/api/0008-EventException-knows-the-source-Event.patch +++ b/patches/api/0008-EventException-knows-the-source-Event.patch @@ -1,15 +1,15 @@ -From 831dc1dffd589df375b022bf1dbd3e5c31535732 Mon Sep 17 00:00:00 2001 +From 5b2d260cdee5649000b78918c188934396598240 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 9 Dec 2016 02:30:37 -0800 Subject: [PATCH] EventException knows the source Event --- - src/main/java/org/bukkit/event/EventException.java | 40 +++++++++++++++------- - .../org/bukkit/plugin/java/JavaPluginLoader.java | 4 +-- + .../java/org/bukkit/event/EventException.java | 40 +++++++++++++------ + .../bukkit/plugin/java/JavaPluginLoader.java | 4 +- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/bukkit/event/EventException.java b/src/main/java/org/bukkit/event/EventException.java -index 84638e8..aef8d49 100644 +index 84638e85..aef8d494 100644 --- a/src/main/java/org/bukkit/event/EventException.java +++ b/src/main/java/org/bukkit/event/EventException.java @@ -2,7 +2,26 @@ package org.bukkit.event; @@ -90,7 +90,7 @@ index 84638e8..aef8d49 100644 } } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index b057b05..6481213 100644 +index b057b053..64812133 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -299,9 +299,9 @@ public final class JavaPluginLoader implements PluginLoader { @@ -106,5 +106,5 @@ index b057b05..6481213 100644 } }, plugin, method, eventClass); // Spigot -- -2.6.4 +2.23.0 diff --git a/patches/api/0009-Efficiently-search-for-blocks-by-material.patch b/patches/api/0009-Efficiently-search-for-blocks-by-material.patch index b21b466..7dfb338 100644 --- a/patches/api/0009-Efficiently-search-for-blocks-by-material.patch +++ b/patches/api/0009-Efficiently-search-for-blocks-by-material.patch @@ -1,4 +1,4 @@ -From 7326dbd65f81c1d46b801c4afea2e299cd83e8e3 Mon Sep 17 00:00:00 2001 +From 135d68c9d7e0f546437677e2f139891b6c0b2f20 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 16 Dec 2016 02:30:37 -0800 Subject: [PATCH] Efficiently search for blocks by material @@ -8,7 +8,7 @@ Subject: [PATCH] Efficiently search for blocks by material 1 file changed, 10 insertions(+) diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index b7bc563..d931109 100644 +index b7bc5632..d9311090 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -5,6 +5,8 @@ import org.bukkit.block.BlockState; @@ -20,10 +20,11 @@ index b7bc563..d931109 100644 /** * Represents a chunk of blocks */ -@@ -42,6 +44,14 @@ public interface Chunk { +@@ -41,6 +43,14 @@ public interface Chunk { + */ Block getBlock(int x, int y, int z); - /** ++ /** + * Get all blocks in this chunk that are made of the given {@link Material} + * + * @param material type of block to search for @@ -31,10 +32,9 @@ index b7bc563..d931109 100644 + */ + Set getBlocks(Material material); + -+ /** + /** * Capture thread-safe read-only snapshot of chunk data * - * @return ChunkSnapshot -- -2.6.4 +2.23.0 diff --git a/patches/api/0010-Override-creation-settings-of-existing-world.patch b/patches/api/0010-Override-creation-settings-of-existing-world.patch index 21308ca..016d44a 100644 --- a/patches/api/0010-Override-creation-settings-of-existing-world.patch +++ b/patches/api/0010-Override-creation-settings-of-existing-world.patch @@ -1,16 +1,16 @@ -From 6fa1198031ddd0f5b9054d7309abbd99ee0f620c Mon Sep 17 00:00:00 2001 +From 3fcd9b53065a3ee583fdfdec09c9a2a9b2e463be Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 28 Jun 2015 03:37:39 -0400 Subject: [PATCH] Override creation settings of existing world --- src/main/java/org/bukkit/Bukkit.java | 8 ++++++++ - src/main/java/org/bukkit/Server.java | 23 +++++++++++++++++++++++ + src/main/java/org/bukkit/Server.java | 23 ++++++++++++++++++++++ src/main/java/org/bukkit/WorldCreator.java | 10 ++++++++++ 3 files changed, 41 insertions(+) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index ccb9596..1bde563 100644 +index ccb9596f..1bde563f 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -471,6 +471,14 @@ public final class Bukkit { @@ -29,13 +29,14 @@ index ccb9596..1bde563 100644 * Creates or loads a world with the given name using the specified * options. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 2b60412..666c4bc 100644 +index 2b604122..666c4bc8 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -388,6 +388,29 @@ public interface Server extends PluginMessageRecipient { +@@ -387,6 +387,29 @@ public interface Server extends PluginMessageRecipient { + */ public List getWorlds(); - /** ++ /** + * Check for a level.dat file belonging to a world with the given name. + * If found, return a {@link WorldCreator} configured to match the settings + * in the level.dat file. If the file is not found, return null. This works @@ -58,12 +59,11 @@ index 2b60412..666c4bc 100644 + */ + World createWorld(String name); + -+ /** + /** * Creates or loads a world with the given name using the specified * options. - *

diff --git a/src/main/java/org/bukkit/WorldCreator.java b/src/main/java/org/bukkit/WorldCreator.java -index 53980fd..81c95d1 100644 +index 53980fdb..81c95d1f 100644 --- a/src/main/java/org/bukkit/WorldCreator.java +++ b/src/main/java/org/bukkit/WorldCreator.java @@ -16,6 +16,7 @@ public class WorldCreator { @@ -91,5 +91,5 @@ index 53980fd..81c95d1 100644 * Creates a world with the specified options. *

-- -2.6.4 +2.23.0 diff --git a/patches/api/0011-Allow-villager-GUI-duplication.patch b/patches/api/0011-Allow-villager-GUI-duplication.patch index e4e2306..7491965 100644 --- a/patches/api/0011-Allow-villager-GUI-duplication.patch +++ b/patches/api/0011-Allow-villager-GUI-duplication.patch @@ -1,4 +1,4 @@ -From 16e649c8733b8eab737ae5b9078d4002c5aa34ff Mon Sep 17 00:00:00 2001 +From cb10e3a2f7141a6f8fbfa8d2c3aa92590e63cecd Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Fri, 23 Dec 2016 03:12:17 -0600 Subject: [PATCH] Allow villager GUI duplication @@ -8,13 +8,14 @@ Subject: [PATCH] Allow villager GUI duplication 1 file changed, 8 insertions(+) diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 3f8646d..8710a7b 100644 +index 3f8646dd..8710a7b2 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java -@@ -90,6 +90,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv +@@ -89,6 +89,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv + */ public InventoryView openEnchanting(Location location, boolean force); - /** ++ /** + * Makes a copy of the given villager's current trading offers and opens + * a trading window for this player, allowing them to interact with those + * offers, without affecting the villager's state, or any other players who @@ -22,10 +23,9 @@ index 3f8646d..8710a7b 100644 + */ + public InventoryView openMerchantCopy(Villager trader); + -+ /** + /** * Opens an inventory window to the specified inventory view. * - * @param inventory The view to open -- -2.6.4 +2.23.0 diff --git a/patches/api/0012-Add-BlockDispenseEntityEvent.patch b/patches/api/0012-Add-BlockDispenseEntityEvent.patch index 99b1fdc..aad7164 100644 --- a/patches/api/0012-Add-BlockDispenseEntityEvent.patch +++ b/patches/api/0012-Add-BlockDispenseEntityEvent.patch @@ -1,16 +1,16 @@ -From 59419e59ba48d54421cd1926ec519c58706b689e Mon Sep 17 00:00:00 2001 +From ae0d201de73677c19df2619d753a4bf7bfb36f39 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Fri, 23 Dec 2016 04:07:15 -0600 Subject: [PATCH] Add BlockDispenseEntityEvent --- - .../event/block/BlockDispenseEntityEvent.java | 49 ++++++++++++++++++++++ + .../event/block/BlockDispenseEntityEvent.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 src/main/java/org/bukkit/event/block/BlockDispenseEntityEvent.java diff --git a/src/main/java/org/bukkit/event/block/BlockDispenseEntityEvent.java b/src/main/java/org/bukkit/event/block/BlockDispenseEntityEvent.java new file mode 100644 -index 0000000..18f35bd +index 00000000..18f35bd7 --- /dev/null +++ b/src/main/java/org/bukkit/event/block/BlockDispenseEntityEvent.java @@ -0,0 +1,49 @@ @@ -65,5 +65,5 @@ index 0000000..18f35bd +} \ No newline at end of file -- -2.6.4 +2.23.0 diff --git a/patches/api/0013-Fake-name-and-skin-API.patch b/patches/api/0013-Fake-name-and-skin-API.patch index 6539e7a..c2f3a0a 100644 --- a/patches/api/0013-Fake-name-and-skin-API.patch +++ b/patches/api/0013-Fake-name-and-skin-API.patch @@ -1,18 +1,18 @@ -From 58a13e07ead97814a980f4e64ac8434b4d8f176c Mon Sep 17 00:00:00 2001 +From c5d5029108d9eb2156c9c9c4c0e2cf0b2a0e29ea Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Thu, 23 Jan 2014 00:17:31 -0500 Subject: [PATCH] Fake name and skin API --- - src/main/java/org/bukkit/Bukkit.java | 23 +++- - src/main/java/org/bukkit/Server.java | 27 +++++ - src/main/java/org/bukkit/Skin.java | 72 ++++++++++++ - src/main/java/org/bukkit/command/Command.java | 2 +- - .../java/org/bukkit/command/CommandSender.java | 6 + - .../org/bukkit/command/defaults/ListCommand.java | 2 +- - .../org/bukkit/command/defaults/TellCommand.java | 3 +- - src/main/java/org/bukkit/entity/Player.java | 122 +++++++++++++++++++++ - .../event/player/PlayerSkinPartsChangeEvent.java | 32 ++++++ + src/main/java/org/bukkit/Bukkit.java | 23 +++- + src/main/java/org/bukkit/Server.java | 27 ++++ + src/main/java/org/bukkit/Skin.java | 72 +++++++++++ + src/main/java/org/bukkit/command/Command.java | 2 +- + .../org/bukkit/command/CommandSender.java | 6 + + .../bukkit/command/defaults/ListCommand.java | 2 +- + .../bukkit/command/defaults/TellCommand.java | 3 +- + src/main/java/org/bukkit/entity/Player.java | 122 ++++++++++++++++++ + .../player/PlayerSkinPartsChangeEvent.java | 32 +++++ 9 files changed, 285 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/bukkit/Skin.java create mode 100644 src/main/java/org/bukkit/event/player/PlayerSkinPartsChangeEvent.java @@ -399,5 +399,5 @@ index 00000000..a199f8cf + } +} -- -2.11.0 +2.23.0 diff --git a/patches/api/0014-Component-support-for-signs.patch b/patches/api/0014-Component-support-for-signs.patch index fa45dbb..4420c4e 100644 --- a/patches/api/0014-Component-support-for-signs.patch +++ b/patches/api/0014-Component-support-for-signs.patch @@ -1,13 +1,13 @@ -From b457d2775eac0cdb26e2d056b45ca733af2c8bf2 Mon Sep 17 00:00:00 2001 +From ec5c8bb45b984cd06eb0df942463d9119ad3c899 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 3 Jun 2016 02:02:23 -0400 Subject: [PATCH] Component support for signs --- - pom.xml | 4 +-- - src/main/java/org/bukkit/block/Sign.java | 21 ++++++++++++ - src/main/java/org/bukkit/entity/Player.java | 6 ++++ - .../org/bukkit/event/block/SignChangeEvent.java | 40 +++++++++++++++++++--- + pom.xml | 4 +- + src/main/java/org/bukkit/block/Sign.java | 21 ++++++++++ + src/main/java/org/bukkit/entity/Player.java | 6 +++ + .../bukkit/event/block/SignChangeEvent.java | 40 ++++++++++++++++--- 4 files changed, 64 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml @@ -178,5 +178,5 @@ index 83188cf5..bf55d816 100644 + // Magnet end } -- -2.11.0 +2.23.0 diff --git a/patches/api/0015-Add-source-method-to-TranslatableComponent.patch b/patches/api/0015-Add-source-method-to-TranslatableComponent.patch index 07ebf3a..85d02e8 100644 --- a/patches/api/0015-Add-source-method-to-TranslatableComponent.patch +++ b/patches/api/0015-Add-source-method-to-TranslatableComponent.patch @@ -1,10 +1,10 @@ -From 52f86bb507f4abff3ef9044dbc6d5f0d742dc2de Mon Sep 17 00:00:00 2001 +From ee8515b58461dfb23b8b9a8eeebdcbae876dcf02 Mon Sep 17 00:00:00 2001 From: kashike Date: Sat, 14 Jan 2017 06:53:06 -0800 Subject: [PATCH] Add source method to TranslatableComponent --- - .../magnet/api/text/translation/TranslatableComponent.java | 11 +++++++++++ + .../api/text/translation/TranslatableComponent.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/net/avicus/magnet/api/text/translation/TranslatableComponent.java b/src/main/java/net/avicus/magnet/api/text/translation/TranslatableComponent.java @@ -35,5 +35,5 @@ index 9bf08435..825fdc19 100644 + } } -- -2.11.0 +2.23.0 diff --git a/patches/api/0016-Skull-skin-API.patch b/patches/api/0016-Skull-skin-API.patch index 85a574f..8987a88 100644 --- a/patches/api/0016-Skull-skin-API.patch +++ b/patches/api/0016-Skull-skin-API.patch @@ -1,11 +1,11 @@ -From f98c17f3b16834eaa3e2c4a501a7830dc80cd765 Mon Sep 17 00:00:00 2001 +From 8f18fcaae3ea0618490055a6463f8beff300ee5e Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Thu, 6 Aug 2015 22:18:43 -0400 Subject: [PATCH] Skull skin API --- - src/main/java/org/bukkit/block/Skull.java | 17 +++++++++++++++++ - src/main/java/org/bukkit/inventory/meta/SkullMeta.java | 17 +++++++++++++++++ + src/main/java/org/bukkit/block/Skull.java | 17 +++++++++++++++++ + .../org/bukkit/inventory/meta/SkullMeta.java | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java @@ -64,5 +64,5 @@ index fab31190..4e65c040 100644 SkullMeta clone(); } -- -2.11.0 +2.23.0 diff --git a/patches/api/0021-Add-ExplosionPrimeByEntityEvent-and-fix-canceling.patch b/patches/api/0021-Add-ExplosionPrimeByEntityEvent-and-fix-canceling.patch index 4cde247..5894077 100644 --- a/patches/api/0021-Add-ExplosionPrimeByEntityEvent-and-fix-canceling.patch +++ b/patches/api/0021-Add-ExplosionPrimeByEntityEvent-and-fix-canceling.patch @@ -1,16 +1,16 @@ -From 937603db8096dc61b477ed537be5e25e3d13ad67 Mon Sep 17 00:00:00 2001 +From 8e917bf588589a907d14434c4341e5c3ff44475d Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Mon, 3 Jul 2017 20:32:32 -0500 Subject: [PATCH] Add ExplosionPrimeByEntityEvent and fix canceling --- - .../event/entity/ExplosionPrimeByEntityEvent.java | 35 ++++++++++++++++++++++ + .../entity/ExplosionPrimeByEntityEvent.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/main/java/org/bukkit/event/entity/ExplosionPrimeByEntityEvent.java diff --git a/src/main/java/org/bukkit/event/entity/ExplosionPrimeByEntityEvent.java b/src/main/java/org/bukkit/event/entity/ExplosionPrimeByEntityEvent.java new file mode 100644 -index 0000000..473e6f9 +index 00000000..473e6f9d --- /dev/null +++ b/src/main/java/org/bukkit/event/entity/ExplosionPrimeByEntityEvent.java @@ -0,0 +1,35 @@ @@ -50,5 +50,5 @@ index 0000000..473e6f9 + } +} -- -2.6.4 +2.23.0 diff --git a/patches/api/0022-Add-PA-Repo.patch b/patches/api/0022-Add-PA-Repo.patch deleted file mode 100644 index d452f86..0000000 --- a/patches/api/0022-Add-PA-Repo.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2b5638b7cf268d49615a86ff8214b39502ad20b1 Mon Sep 17 00:00:00 2001 -From: Austin Mayes -Date: Fri, 14 Jul 2017 22:46:17 -0500 -Subject: [PATCH] Add PA Repo - ---- - pom.xml | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/pom.xml b/pom.xml -index 5448cf9..0c3fe9e 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -21,6 +21,17 @@ - UTF-8 - - -+ -+ -+ pa-snapshots -+ https://repo.extension.ws/content/repositories/snapshots -+ -+ -+ pa-releases -+ https://repo.extension.ws/content/repositories/releases -+ -+ -+ - - - --- -2.6.4 diff --git a/patches/server/0001-Magnet-Server-mc-dev-Imports.patch b/patches/server/0001-Magnet-Server-mc-dev-Imports.patch index 900693f..4a2821c 100644 --- a/patches/server/0001-Magnet-Server-mc-dev-Imports.patch +++ b/patches/server/0001-Magnet-Server-mc-dev-Imports.patch @@ -1,4 +1,4 @@ -From fc15abcbb5634899c7980c8706aecd8afa7b8f48 Mon Sep 17 00:00:00 2001 +From e2c1445fccffda8e4a3e03e5d051e0d2394b4c4c Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Sun, 1 Jan 2017 23:56:23 -0600 Subject: [PATCH] Magnet-Server mc-dev Imports @@ -8,9 +8,9 @@ Subject: [PATCH] Magnet-Server mc-dev Imports Imported PacketPlayOutEntityMetadata.java from mc-dev --- - .../server/PacketPlayOutEntityMetadata.java | 40 ++++ - .../minecraft/server/PacketPlayOutPlayerInfo.java | 254 +++++++++++++++++++++ - .../server/PacketPlayOutScoreboardTeam.java | 112 +++++++++ + .../server/PacketPlayOutEntityMetadata.java | 40 +++ + .../server/PacketPlayOutPlayerInfo.java | 254 ++++++++++++++++++ + .../server/PacketPlayOutScoreboardTeam.java | 112 ++++++++ 3 files changed, 406 insertions(+) create mode 100644 src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java create mode 100644 src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java @@ -18,7 +18,7 @@ Subject: [PATCH] Magnet-Server mc-dev Imports diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java b/src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java new file mode 100644 -index 0000000..c5be70f +index 00000000..c5be70f8 --- /dev/null +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java @@ -0,0 +1,40 @@ @@ -64,7 +64,7 @@ index 0000000..c5be70f +} diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java new file mode 100644 -index 0000000..dbfc964 +index 00000000..dbfc9640 --- /dev/null +++ b/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java @@ -0,0 +1,254 @@ @@ -324,7 +324,7 @@ index 0000000..dbfc964 +} diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java new file mode 100644 -index 0000000..4b8eb3e +index 00000000..4b8eb3ee --- /dev/null +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java @@ -0,0 +1,112 @@ @@ -441,5 +441,5 @@ index 0000000..4b8eb3e + } +} -- -2.6.4 +2.23.0 diff --git a/patches/server/0002-This-is-Magnet.patch b/patches/server/0002-This-is-Magnet.patch index 7e01b3c..b08a477 100644 --- a/patches/server/0002-This-is-Magnet.patch +++ b/patches/server/0002-This-is-Magnet.patch @@ -1,16 +1,16 @@ -From 381e49507a64859c634e0c50939d6da77ee63b2a Mon Sep 17 00:00:00 2001 +From c2bfd998e01ba70401cea440ca4976aa3ec8557b Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 16 Dec 2016 12:49:31 -0800 Subject: [PATCH] This is Magnet --- - pom.xml | 18 ++++++++---------- - .../java/net/minecraft/server/MinecraftServer.java | 2 +- - .../java/org/bukkit/craftbukkit/util/Versioning.java | 2 +- + pom.xml | 18 ++++++++---------- + .../net/minecraft/server/MinecraftServer.java | 2 +- + .../bukkit/craftbukkit/util/Versioning.java | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml -index 6aaba50..f5aa732 100644 +index 6aaba502..f5aa7328 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,10 @@ @@ -62,7 +62,7 @@ index 6aaba50..f5aa732 100644 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b400ce0..a7c8cba 100644 +index b400ce04..a7c8cbac 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1084,7 +1084,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -75,7 +75,7 @@ index b400ce0..a7c8cba 100644 public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 3a4b142..b820598 100644 +index 3a4b1424..b8205981 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { @@ -88,5 +88,5 @@ index 3a4b142..b820598 100644 if (stream != null) { -- -2.6.4 +2.23.0 diff --git a/patches/server/0003-Add-methods-for-working-with-locales-translations-an.patch b/patches/server/0003-Add-methods-for-working-with-locales-translations-an.patch index 761e424..ae7fec5 100644 --- a/patches/server/0003-Add-methods-for-working-with-locales-translations-an.patch +++ b/patches/server/0003-Add-methods-for-working-with-locales-translations-an.patch @@ -1,16 +1,16 @@ -From d8a138d095349f4893f4f6f74de0c250b95dd3b0 Mon Sep 17 00:00:00 2001 +From 3949aa0cc9a53afba6468cace6e869d1f025e235 Mon Sep 17 00:00:00 2001 From: kashike Date: Sat, 17 Dec 2016 02:31:07 -0800 Subject: [PATCH] Add methods for working with locales/translations, and add methods to send components based on type --- - .../java/net/minecraft/server/EntityPlayer.java | 1 + - .../org/bukkit/craftbukkit/entity/CraftPlayer.java | 48 ++++++++++++++++++++++ + .../net/minecraft/server/EntityPlayer.java | 1 + + .../craftbukkit/entity/CraftPlayer.java | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 0c49a25..1e0706d 100644 +index 0c49a256..1e0706d8 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1017,6 +1017,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -22,7 +22,7 @@ index 0c49a25..1e0706d 100644 // PaperSpigot end this.bR = packetplayinsettings.c(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d44fc62..4bfd59d 100644 +index d44fc62b..4bfd59db 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -80,6 +80,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -86,5 +86,5 @@ index d44fc62..4bfd59d 100644 + // Magnet end } -- -2.6.4 +2.23.0 diff --git a/patches/server/0004-Add-BlockFallEvent.patch b/patches/server/0004-Add-BlockFallEvent.patch index 170edd7..1626348 100644 --- a/patches/server/0004-Add-BlockFallEvent.patch +++ b/patches/server/0004-Add-BlockFallEvent.patch @@ -1,14 +1,14 @@ -From ac332640ecd6cd4ce33d6acbf45a5aa50c08fb29 Mon Sep 17 00:00:00 2001 +From f1085414dff2198eba4bb69cab71287e22701df6 Mon Sep 17 00:00:00 2001 From: YukonAppleGeek Date: Thu, 29 Dec 2016 02:31:07 -0800 Subject: [PATCH] Add BlockFallEvent --- - src/main/java/net/minecraft/server/BlockFalling.java | 14 ++++++++++++++ + .../java/net/minecraft/server/BlockFalling.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/net/minecraft/server/BlockFalling.java b/src/main/java/net/minecraft/server/BlockFalling.java -index 1d952b8..e8a0853 100644 +index 1d952b82..e8a0853a 100644 --- a/src/main/java/net/minecraft/server/BlockFalling.java +++ b/src/main/java/net/minecraft/server/BlockFalling.java @@ -2,6 +2,8 @@ package net.minecraft.server; @@ -40,5 +40,5 @@ index 1d952b8..e8a0853 100644 } } else { -- -2.6.4 +2.23.0 diff --git a/patches/server/0005-Fire-BlockBreakEvent-for-extinguishing-fire-and-fix-.patch b/patches/server/0005-Fire-BlockBreakEvent-for-extinguishing-fire-and-fix-.patch index 0834e42..7bed691 100644 --- a/patches/server/0005-Fire-BlockBreakEvent-for-extinguishing-fire-and-fix-.patch +++ b/patches/server/0005-Fire-BlockBreakEvent-for-extinguishing-fire-and-fix-.patch @@ -1,16 +1,16 @@ -From 4daf776b696ab58cc5940cdb512065b7064fbe11 Mon Sep 17 00:00:00 2001 +From 561d140ad409001d45382259f7c15151f8a893e7 Mon Sep 17 00:00:00 2001 From: mrapple Date: Wed, 15 May 2013 20:09:16 -0500 Subject: [PATCH] Fire BlockBreakEvent for extinguishing fire and fix cancelling interact events working with fire --- - src/main/java/net/minecraft/server/PlayerInteractManager.java | 11 +++++++++-- - src/main/java/net/minecraft/server/World.java | 9 +++++++-- + .../net/minecraft/server/PlayerInteractManager.java | 11 +++++++++-- + src/main/java/net/minecraft/server/World.java | 9 +++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 33a0a09..6a6f9b2 100644 +index 33a0a095..6a6f9b25 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -108,6 +108,13 @@ public class PlayerInteractManager { @@ -46,7 +46,7 @@ index 33a0a09..6a6f9b2 100644 if (event.useItemInHand() == Event.Result.DENY) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8f3511f..f273747 100644 +index 8f3511f8..f2737477 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1954,8 +1954,13 @@ public abstract class World implements IBlockAccess { @@ -66,5 +66,5 @@ index 8f3511f..f273747 100644 } else { return false; -- -2.6.4 +2.23.0 diff --git a/patches/server/0006-Add-onGround-API-SportBukkit.patch b/patches/server/0006-Add-onGround-API-SportBukkit.patch index 75d1b93..73ab439 100644 --- a/patches/server/0006-Add-onGround-API-SportBukkit.patch +++ b/patches/server/0006-Add-onGround-API-SportBukkit.patch @@ -1,14 +1,14 @@ -From f4661554a77b886b5bd535686ee20eece97898b1 Mon Sep 17 00:00:00 2001 +From 7771ef7c34c373eb285a972da5ac59c140aa89da Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Thu, 23 May 2013 20:09:16 -0500 Subject: [PATCH] Add onGround API (SportBukkit) --- - .../net/minecraft/server/PlayerConnection.java | 28 +++++++++++----------- + .../minecraft/server/PlayerConnection.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 4391ad7..05b5937 100644 +index 4391ad7e..05b5937f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -43,20 +43,7 @@ import org.bukkit.event.inventory.InventoryAction; @@ -61,5 +61,5 @@ index 4391ad7..05b5937 100644 } else if (this.e - this.f > 20) { this.a(this.o, this.p, this.q, this.player.yaw, this.player.pitch); -- -2.6.4 +2.23.0 diff --git a/patches/server/0007-Add-PlayerSpawnEntityEvent.patch b/patches/server/0007-Add-PlayerSpawnEntityEvent.patch index 540b656..661088e 100644 --- a/patches/server/0007-Add-PlayerSpawnEntityEvent.patch +++ b/patches/server/0007-Add-PlayerSpawnEntityEvent.patch @@ -1,14 +1,14 @@ -From f8e5d337a58273afa8884ae3edaaaedda346d1d0 Mon Sep 17 00:00:00 2001 +From 98c5939ce11167fb6564f961be6380d98a2a5131 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Thu, 23 May 2013 20:09:16 -0500 Subject: [PATCH] Add PlayerSpawnEntityEvent --- - .../java/net/minecraft/server/ItemMonsterEgg.java | 29 +++++++++++++++++++++- + .../net/minecraft/server/ItemMonsterEgg.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java -index 84f5da5..daabd6a 100644 +index 84f5da5b..daabd6af 100644 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java @@ -1,5 +1,8 @@ @@ -54,5 +54,5 @@ index 84f5da5..daabd6a 100644 if (entity != null) { if (entity instanceof EntityLiving && itemstack.hasName()) { -- -2.6.4 +2.23.0 diff --git a/patches/server/0009-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch b/patches/server/0009-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch index 95e7816..389cbf8 100644 --- a/patches/server/0009-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch +++ b/patches/server/0009-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch @@ -1,14 +1,14 @@ -From e861cbdc9af163883d090a34307cdb893511a748 Mon Sep 17 00:00:00 2001 +From 808791473454df471c7dfeaf233f3d04ba38bb30 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 12 Apr 2014 22:42:11 -0400 Subject: [PATCH] Fix BlockFromToEvents firing when flow is obstructed --- - src/main/java/net/minecraft/server/BlockFlowing.java | 14 ++++++++------ + .../java/net/minecraft/server/BlockFlowing.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index 23130ba..b1168df 100644 +index 23130ba9..b1168dfe 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -143,13 +143,15 @@ public class BlockFlowing extends BlockFluids { @@ -34,5 +34,5 @@ index 23130ba..b1168df 100644 // CraftBukkit end } -- -2.6.4 +2.23.0 diff --git a/patches/server/0010-Simple-bulk-block-replacement.patch b/patches/server/0010-Simple-bulk-block-replacement.patch index 288cd43..45943be 100644 --- a/patches/server/0010-Simple-bulk-block-replacement.patch +++ b/patches/server/0010-Simple-bulk-block-replacement.patch @@ -1,14 +1,14 @@ -From ed6ea0b2292a87b5a6494062f136016b42bba5ca Mon Sep 17 00:00:00 2001 +From c5871c62440135731c975a6ea717e71e69828573 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 28 Sep 2014 05:48:35 -0400 Subject: [PATCH] Simple bulk block replacement --- - .../java/org/bukkit/craftbukkit/CraftChunk.java | 32 ++++++++++++++++++++++ + .../org/bukkit/craftbukkit/CraftChunk.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 8a33e28..b425a7d 100644 +index 8a33e282..b425a7d3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -6,12 +6,14 @@ import java.util.Arrays; @@ -64,5 +64,5 @@ index 8a33e28..b425a7d 100644 BiomeBase[] biomes = chunkmanager.getBiomes(null, chunkX, chunkZ, 16, 16); float[] temps = new float[biomes.length]; -- -2.6.4 +2.23.0 diff --git a/patches/server/0011-Efficiently-search-for-blocks-by-material.patch b/patches/server/0011-Efficiently-search-for-blocks-by-material.patch index dd37c31..2ca1278 100644 --- a/patches/server/0011-Efficiently-search-for-blocks-by-material.patch +++ b/patches/server/0011-Efficiently-search-for-blocks-by-material.patch @@ -1,14 +1,14 @@ -From a89c89bb03a73c8c4320f1fd25eed7c4ff06256d Mon Sep 17 00:00:00 2001 +From de4e929b9d62ae6dafe142a10384bb3b94196460 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Mon, 16 Feb 2015 04:58:46 -0500 Subject: [PATCH] Efficiently search for blocks by material --- - .../java/org/bukkit/craftbukkit/CraftChunk.java | 26 ++++++++++++++++++++++ + .../org/bukkit/craftbukkit/CraftChunk.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index b425a7d..80de4eb 100644 +index b425a7d3..80de4eb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit; @@ -59,5 +59,5 @@ index b425a7d..80de4eb 100644 int count = 0, index = 0; net.minecraft.server.Chunk chunk = getHandle(); -- -2.6.4 +2.23.0 diff --git a/patches/server/0014-Override-creation-settings-of-existing-world.patch b/patches/server/0014-Override-creation-settings-of-existing-world.patch index b395c1a..156ef31 100644 --- a/patches/server/0014-Override-creation-settings-of-existing-world.patch +++ b/patches/server/0014-Override-creation-settings-of-existing-world.patch @@ -1,14 +1,14 @@ -From 423e48c02dcedb8a7687a57527a6e948fbb6dbe5 Mon Sep 17 00:00:00 2001 +From afd7d2a61f4a075e865e61398818317f43e5d9fc Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 28 Jun 2015 03:39:14 -0400 Subject: [PATCH] Override creation settings of existing world --- - .../java/org/bukkit/craftbukkit/CraftServer.java | 27 +++++++++++++++++++--- + .../org/bukkit/craftbukkit/CraftServer.java | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 69485fa..6fabb5c 100644 +index 69485fa6..6fabb5c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -833,6 +833,25 @@ public final class CraftServer implements Server { @@ -58,5 +58,5 @@ index 69485fa..6fabb5c 100644 worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end) WorldServer internal = (WorldServer) new WorldServer(console, sdm, worlddata, dimension, console.methodProfiler, creator.environment(), generator).b(); -- -2.6.4 +2.23.0 diff --git a/patches/server/0015-Allow-villager-GUI-duplication.patch b/patches/server/0015-Allow-villager-GUI-duplication.patch index b6615a0..3345b79 100644 --- a/patches/server/0015-Allow-villager-GUI-duplication.patch +++ b/patches/server/0015-Allow-villager-GUI-duplication.patch @@ -1,14 +1,14 @@ -From 2249eba2dc8ebaa77f6eb37e17ba3a67087bdad4 Mon Sep 17 00:00:00 2001 +From ad784a8fe1a30e50f41915c59e574ac3f07367c6 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Fri, 23 Dec 2016 03:12:50 -0600 Subject: [PATCH] Allow villager GUI duplication --- - .../bukkit/craftbukkit/entity/CraftHumanEntity.java | 21 +++++++++++++++++++++ + .../craftbukkit/entity/CraftHumanEntity.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 8a08bab..ec3235e 100644 +index 8a08babc..ec3235e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -2,12 +2,14 @@ package org.bukkit.craftbukkit.entity; @@ -53,5 +53,5 @@ index 8a08bab..ec3235e 100644 return perm.addAttachment(plugin); } -- -2.6.4 +2.23.0 diff --git a/patches/server/0016-Add-BlockDispenseEntityEvent.patch b/patches/server/0016-Add-BlockDispenseEntityEvent.patch index f6a0c91..b2fbb19 100644 --- a/patches/server/0016-Add-BlockDispenseEntityEvent.patch +++ b/patches/server/0016-Add-BlockDispenseEntityEvent.patch @@ -1,18 +1,18 @@ -From 7200aa46da165c37312152829935111fbefa36f7 Mon Sep 17 00:00:00 2001 +From dc798ffcbf9269b553dc62bd46e33db36dc54108 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Fri, 23 Dec 2016 04:07:10 -0600 Subject: [PATCH] Add BlockDispenseEntityEvent --- - .../net/minecraft/server/DispenseBehaviorItem.java | 8 ++-- - .../server/DispenseBehaviorProjectile.java | 4 +- - .../net/minecraft/server/DispenserRegistry.java | 51 ++++++++++++++-------- - .../java/net/minecraft/server/ItemMinecart.java | 10 +++-- - .../org/bukkit/craftbukkit/entity/CraftEntity.java | 7 +++ + .../server/DispenseBehaviorItem.java | 8 +-- + .../server/DispenseBehaviorProjectile.java | 4 +- + .../minecraft/server/DispenserRegistry.java | 51 ++++++++++++------- + .../net/minecraft/server/ItemMinecart.java | 10 ++-- + .../craftbukkit/entity/CraftEntity.java | 7 +++ 5 files changed, 53 insertions(+), 27 deletions(-) diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorItem.java b/src/main/java/net/minecraft/server/DispenseBehaviorItem.java -index 35a3ff8..8db2f08 100644 +index 35a3ff8f..8db2f085 100644 --- a/src/main/java/net/minecraft/server/DispenseBehaviorItem.java +++ b/src/main/java/net/minecraft/server/DispenseBehaviorItem.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -45,7 +45,7 @@ index 35a3ff8..8db2f08 100644 if (!event.getItem().getType().equals(craftItem.getType())) { // Chain to handler for new item diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorProjectile.java b/src/main/java/net/minecraft/server/DispenseBehaviorProjectile.java -index 5cb0363..4accb2d 100644 +index 5cb03637..4accb2d5 100644 --- a/src/main/java/net/minecraft/server/DispenseBehaviorProjectile.java +++ b/src/main/java/net/minecraft/server/DispenseBehaviorProjectile.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -74,7 +74,7 @@ index 5cb0363..4accb2d 100644 ((Entity) iprojectile).projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource((TileEntityDispenser) isourceblock.getTileEntity()); // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java -index cc7a1e3..873fcc3 100644 +index cc7a1e31..873fcc37 100644 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java @@ -9,6 +9,8 @@ import org.apache.logging.log4j.Logger; @@ -208,7 +208,7 @@ index cc7a1e3..873fcc3 100644 world.addEntity(entitytntprimed); diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java -index e9fc40e..49a72f0 100644 +index e9fc40e9..49a72f01 100644 --- a/src/main/java/net/minecraft/server/ItemMinecart.java +++ b/src/main/java/net/minecraft/server/ItemMinecart.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -247,7 +247,7 @@ index e9fc40e..49a72f0 100644 if (itemstack.hasName()) { entityminecartabstract.setCustomName(itemstack.getName()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 4f91799..a2223e4 100644 +index 4f917990..a2223e4a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -201,6 +201,13 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -265,5 +265,5 @@ index 4f91799..a2223e4 100644 return new Vector(entity.motX, entity.motY, entity.motZ); } -- -2.6.4 +2.23.0 diff --git a/patches/server/0017-Fake-name-and-skin-API.patch b/patches/server/0017-Fake-name-and-skin-API.patch index c3e0adb..e44c1e2 100644 --- a/patches/server/0017-Fake-name-and-skin-API.patch +++ b/patches/server/0017-Fake-name-and-skin-API.patch @@ -1,21 +1,21 @@ -From 661dd110ce343d6bfda927285603337bbea0329b Mon Sep 17 00:00:00 2001 +From 8b27b3bb2d694d997fd3310a13cb9ac344cb5e7e Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 11 Feb 2014 22:12:50 -0600 Subject: [PATCH] Fake name and skin API --- - .../java/net/minecraft/server/EntityPlayer.java | 9 +- - .../minecraft/server/PacketPlayOutPlayerInfo.java | 14 ++ - .../server/PacketPlayOutScoreboardTeam.java | 22 ++ - .../net/minecraft/server/PlayerConnection.java | 55 ++++- - src/main/java/net/minecraft/server/PlayerList.java | 20 +- - .../java/org/bukkit/craftbukkit/CraftServer.java | 45 +++- - .../command/ProxiedNativeCommandSender.java | 6 + - .../craftbukkit/command/ServerCommandSender.java | 7 + - .../org/bukkit/craftbukkit/entity/CraftEntity.java | 7 + - .../craftbukkit/entity/CraftMinecartCommand.java | 7 + - .../org/bukkit/craftbukkit/entity/CraftPlayer.java | 263 ++++++++++++++++++++- - .../java/org/bukkit/craftbukkit/util/Skins.java | 61 +++++ + .../net/minecraft/server/EntityPlayer.java | 9 +- + .../server/PacketPlayOutPlayerInfo.java | 14 + + .../server/PacketPlayOutScoreboardTeam.java | 22 ++ + .../minecraft/server/PlayerConnection.java | 55 +++- + .../java/net/minecraft/server/PlayerList.java | 20 +- + .../org/bukkit/craftbukkit/CraftServer.java | 45 ++- + .../command/ProxiedNativeCommandSender.java | 6 + + .../command/ServerCommandSender.java | 7 + + .../craftbukkit/entity/CraftEntity.java | 7 + + .../entity/CraftMinecartCommand.java | 7 + + .../craftbukkit/entity/CraftPlayer.java | 263 +++++++++++++++++- + .../org/bukkit/craftbukkit/util/Skins.java | 61 ++++ 12 files changed, 501 insertions(+), 15 deletions(-) create mode 100644 src/main/java/org/bukkit/craftbukkit/util/Skins.java @@ -745,5 +745,5 @@ index 00000000..43345fa5 + } +} -- -2.11.0 +2.23.0 diff --git a/patches/server/0018-Component-support-for-signs.patch b/patches/server/0018-Component-support-for-signs.patch index 24670bc..ef24ea6 100644 --- a/patches/server/0018-Component-support-for-signs.patch +++ b/patches/server/0018-Component-support-for-signs.patch @@ -1,14 +1,14 @@ -From ea58a68429e24654825f1667f0fcd18b5ba9f592 Mon Sep 17 00:00:00 2001 +From 6ccf21a1e79a87699d974889ee734a9c2a6f4240 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 3 Jun 2016 02:02:17 -0400 Subject: [PATCH] Component support for signs --- - .../java/net/minecraft/server/ChatModifier.java | 12 ++ - .../net/minecraft/server/PlayerConnection.java | 13 +- - .../org/bukkit/craftbukkit/block/CraftSign.java | 65 +++++-- - .../org/bukkit/craftbukkit/entity/CraftPlayer.java | 34 +++- - .../bukkit/craftbukkit/util/BungeeChatUtils.java | 187 +++++++++++++++++++++ + .../net/minecraft/server/ChatModifier.java | 12 ++ + .../minecraft/server/PlayerConnection.java | 13 +- + .../bukkit/craftbukkit/block/CraftSign.java | 65 +++++- + .../craftbukkit/entity/CraftPlayer.java | 34 +++- + .../craftbukkit/util/BungeeChatUtils.java | 187 ++++++++++++++++++ 5 files changed, 296 insertions(+), 15 deletions(-) create mode 100644 src/main/java/org/bukkit/craftbukkit/util/BungeeChatUtils.java @@ -426,5 +426,5 @@ index 00000000..c0ff3a1e + } +} -- -2.11.0 +2.23.0 diff --git a/patches/server/0019-Fix-reduced-knockback-for-players-who-logged-in-late.patch b/patches/server/0019-Fix-reduced-knockback-for-players-who-logged-in-late.patch index c6c74f1..dbe955c 100644 --- a/patches/server/0019-Fix-reduced-knockback-for-players-who-logged-in-late.patch +++ b/patches/server/0019-Fix-reduced-knockback-for-players-who-logged-in-late.patch @@ -1,11 +1,11 @@ -From dd675b07c9f440296710e5da8c96e424b9c256cd Mon Sep 17 00:00:00 2001 +From 831bc2cb240418b727a3e88ac72837eb34aca76f Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 13 May 2014 22:42:51 -0400 Subject: [PATCH] Fix reduced knockback for players who logged in later --- - .../java/net/minecraft/server/EntityHuman.java | 25 +++++++++++++++++-- - .../org/bukkit/craftbukkit/entity/CraftPlayer.java | 28 ++++++++++++++++++++++ + .../net/minecraft/server/EntityHuman.java | 25 +++++++++++++++-- + .../craftbukkit/entity/CraftPlayer.java | 28 +++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java @@ -90,5 +90,5 @@ index cc29c449..51ec959c 100644 // Magnet end } -- -2.11.0 +2.23.0 diff --git a/patches/server/0020-Expose-CraftItemStack-parent.patch b/patches/server/0020-Expose-CraftItemStack-parent.patch index 59d1409..b886e7a 100644 --- a/patches/server/0020-Expose-CraftItemStack-parent.patch +++ b/patches/server/0020-Expose-CraftItemStack-parent.patch @@ -1,10 +1,10 @@ -From c17e9603423632e0a90195dbcee564e8112d99d2 Mon Sep 17 00:00:00 2001 +From 312dca05e7c6d031bef0d3b4bc4f81363326694c Mon Sep 17 00:00:00 2001 From: kashike Date: Sun, 15 Jan 2017 10:18:46 -0800 Subject: [PATCH] Expose CraftItemStack parent --- - src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java | 5 +++++ + .../org/bukkit/craftbukkit/inventory/CraftItemStack.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -24,5 +24,5 @@ index 23f05f4d..91d287b8 100644 /** * Mirror -- -2.11.0 +2.23.0 diff --git a/patches/server/0023-Skull-skin-API.patch b/patches/server/0023-Skull-skin-API.patch index 51ddeef..a3a4fcc 100644 --- a/patches/server/0023-Skull-skin-API.patch +++ b/patches/server/0023-Skull-skin-API.patch @@ -1,11 +1,11 @@ -From 45ff24d172b4ddfe75b598c3e4a6428e8db31528 Mon Sep 17 00:00:00 2001 +From 3498801ff3ace6e33323f7b3b0484ae893e116fb Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Thu, 6 Aug 2015 22:18:57 -0400 Subject: [PATCH] Skull skin API --- - src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java | 14 ++++++++++++++ - .../org/bukkit/craftbukkit/inventory/CraftMetaSkull.java | 13 +++++++++++++ + .../org/bukkit/craftbukkit/block/CraftSkull.java | 14 ++++++++++++++ + .../craftbukkit/inventory/CraftMetaSkull.java | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java @@ -58,5 +58,5 @@ index 55bbad76..bec8ec0f 100644 int applyHash() { final int original; -- -2.11.0 +2.23.0 diff --git a/patches/server/0024-Add-fast-block-change-methods.patch b/patches/server/0024-Add-fast-block-change-methods.patch index 48c23f9..677cf45 100644 --- a/patches/server/0024-Add-fast-block-change-methods.patch +++ b/patches/server/0024-Add-fast-block-change-methods.patch @@ -1,11 +1,11 @@ -From 072e511d88094c4c56a4ae9da77e44ded5f1a0a2 Mon Sep 17 00:00:00 2001 +From 5a5e0ee2a4754a982d296d06f373c7117d2e0a53 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 27 Jan 2017 20:47:55 -0800 Subject: [PATCH] Add fast block change methods --- - .../java/net/minecraft/server/BlockPosition.java | 6 +++++ - .../java/org/bukkit/craftbukkit/CraftWorld.java | 29 ++++++++++++++++++++++ + .../net/minecraft/server/BlockPosition.java | 6 ++++ + .../org/bukkit/craftbukkit/CraftWorld.java | 29 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java @@ -62,5 +62,5 @@ index 76400709..9fa833e3 100644 + // Magnet end } -- -2.11.0 +2.23.0 diff --git a/patches/server/0026-Add-virtual-anvil-API.patch b/patches/server/0026-Add-virtual-anvil-API.patch index e9450dc..92b5ea4 100644 --- a/patches/server/0026-Add-virtual-anvil-API.patch +++ b/patches/server/0026-Add-virtual-anvil-API.patch @@ -1,10 +1,10 @@ -From 160f72331e0ccef69d773fdbf2637c8bca426edf Mon Sep 17 00:00:00 2001 +From af94ef4237cac75accfb5ef53a8622e63a80a837 Mon Sep 17 00:00:00 2001 From: kashike Date: Sat, 28 Jan 2017 23:44:34 -0800 Subject: [PATCH] Add virtual anvil API --- - .../craftbukkit/entity/CraftHumanEntity.java | 26 ++++++++++++++++++++++ + .../craftbukkit/entity/CraftHumanEntity.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -45,5 +45,5 @@ index ec3235e8..f1c66084 100644 if (!(getHandle() instanceof EntityPlayer)) return; // TODO: NPC support? if (((EntityPlayer) getHandle()).playerConnection == null) return; -- -2.11.0 +2.23.0 diff --git a/patches/server/0027-Expose-CraftItemMeta-and-fix-cloning.patch b/patches/server/0027-Expose-CraftItemMeta-and-fix-cloning.patch index 7d3b820..b99f676 100644 --- a/patches/server/0027-Expose-CraftItemMeta-and-fix-cloning.patch +++ b/patches/server/0027-Expose-CraftItemMeta-and-fix-cloning.patch @@ -1,17 +1,17 @@ -From 3474714dfbdfc756cfc21f6e4c3ebe8e01c3d2e3 Mon Sep 17 00:00:00 2001 +From 065e68c318c726e566ee38b92b2a513ee75e9a7c Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Thu, 30 Mar 2017 13:54:00 -0500 Subject: [PATCH] Expose CraftItemMeta and fix cloning --- - .../bukkit/craftbukkit/inventory/CraftMetaBanner.java | 7 +++++++ - .../craftbukkit/inventory/CraftMetaBlockState.java | 9 +++++++++ - .../org/bukkit/craftbukkit/inventory/CraftMetaItem.java | 16 +++++++++++++++- - .../inventory/ItemMetaImplementationOverrideTest.java | 7 +++++-- + .../craftbukkit/inventory/CraftMetaBanner.java | 7 +++++++ + .../inventory/CraftMetaBlockState.java | 9 +++++++++ + .../craftbukkit/inventory/CraftMetaItem.java | 16 +++++++++++++++- + .../ItemMetaImplementationOverrideTest.java | 7 +++++-- 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java -index 80f9ffa..00c7a99 100644 +index 80f9ffa9..00c7a99f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java @@ -201,4 +201,11 @@ public class CraftMetaBanner extends CraftMetaItem implements BannerMeta { @@ -27,7 +27,7 @@ index 80f9ffa..00c7a99 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java -index d60686d..92d3e58 100644 +index d60686d6..92d3e589 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java @@ -335,4 +335,13 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta @@ -45,7 +45,7 @@ index d60686d..92d3e58 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index eaaa6a1..c9b1620 100644 +index eaaa6a11..c9b1620e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -76,7 +76,7 @@ import net.minecraft.server.IAttribute; @@ -79,7 +79,7 @@ index eaaa6a1..c9b1620 100644 private final Spigot spigot = new Spigot() { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java -index f1b4ec0..ad35cd4 100644 +index f1b4ec0d..ad35cd46 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaImplementationOverrideTest.java @@ -47,8 +47,11 @@ public class ItemMetaImplementationOverrideTest { @@ -97,5 +97,5 @@ index f1b4ec0..ad35cd4 100644 clazz.getSimpleName() + " contains " + method.getName() } -- -2.6.4 +2.23.0 diff --git a/patches/server/0029-Add-method-to-get-positions-in-a-chunk.patch b/patches/server/0029-Add-method-to-get-positions-in-a-chunk.patch index 66aff8b..742c02f 100644 --- a/patches/server/0029-Add-method-to-get-positions-in-a-chunk.patch +++ b/patches/server/0029-Add-method-to-get-positions-in-a-chunk.patch @@ -1,14 +1,14 @@ -From 645318b6c8ad55dc3a2e094abc662d803b38be9a Mon Sep 17 00:00:00 2001 +From 4acef33cee8303e8a8493b81266df547250ff66e Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 5 May 2017 19:50:49 -0700 Subject: [PATCH] Add method to get positions in a chunk --- - .../java/org/bukkit/craftbukkit/CraftChunk.java | 36 ++++++++++++++++++++++ + .../org/bukkit/craftbukkit/CraftChunk.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 6ebc283b6..ddd4d06c4 100644 +index 6ebc283b..ddd4d06c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -110,6 +110,42 @@ public class CraftChunk implements Chunk { @@ -55,5 +55,5 @@ index 6ebc283b6..ddd4d06c4 100644 public Entity[] getEntities() { -- -2.12.2 +2.23.0 diff --git a/patches/server/0030-Add-ExplosionPrimeByEntityEvent-and-fix-canceling.patch b/patches/server/0030-Add-ExplosionPrimeByEntityEvent-and-fix-canceling.patch index 2e01204..1c11efb 100644 --- a/patches/server/0030-Add-ExplosionPrimeByEntityEvent-and-fix-canceling.patch +++ b/patches/server/0030-Add-ExplosionPrimeByEntityEvent-and-fix-canceling.patch @@ -1,18 +1,18 @@ -From 51e5a6f6ca7158e204994c35345d881dfb4d3e7f Mon Sep 17 00:00:00 2001 +From 49c036abbf90656b88f299131cc2d6c8616b31fe Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Mon, 3 Jul 2017 20:31:56 -0500 Subject: [PATCH] Add ExplosionPrimeByEntityEvent and fix canceling --- - src/main/java/net/minecraft/server/BlockTNT.java | 56 +++++++++++++++++++--- - .../java/net/minecraft/server/EntityCreeper.java | 27 ++++++++++- - .../net/minecraft/server/EntityEnderCrystal.java | 8 +++- - .../net/minecraft/server/EntityLargeFireball.java | 8 +--- - .../java/net/minecraft/server/EntityTNTPrimed.java | 10 +--- + .../java/net/minecraft/server/BlockTNT.java | 56 +++++++++++++++++-- + .../net/minecraft/server/EntityCreeper.java | 27 ++++++++- + .../minecraft/server/EntityEnderCrystal.java | 8 ++- + .../minecraft/server/EntityLargeFireball.java | 8 +-- + .../net/minecraft/server/EntityTNTPrimed.java | 10 +--- 5 files changed, 85 insertions(+), 24 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java -index 3d1e583..831aa72 100644 +index 3d1e583f..831aa723 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -2,6 +2,9 @@ package net.minecraft.server; @@ -123,7 +123,7 @@ index 3d1e583..831aa72 100644 } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index fecf94d..63b593e 100644 +index fecf94da..63b593e5 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -189,7 +189,7 @@ index fecf94d..63b593e 100644 if (!event.isCancelled()) { this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire(), flag); diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java -index 07533e4..0a37fd7 100644 +index 07533e4a..0a37fd7b 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -215,7 +215,7 @@ index 07533e4..0a37fd7 100644 if (event.isCancelled()) { this.dead = false; diff --git a/src/main/java/net/minecraft/server/EntityLargeFireball.java b/src/main/java/net/minecraft/server/EntityLargeFireball.java -index b62c037..3cd1a7f 100644 +index b62c0376..3cd1a7f3 100644 --- a/src/main/java/net/minecraft/server/EntityLargeFireball.java +++ b/src/main/java/net/minecraft/server/EntityLargeFireball.java @@ -23,14 +23,8 @@ public class EntityLargeFireball extends EntityFireball { @@ -235,7 +235,7 @@ index b62c037..3cd1a7f 100644 this.die(); } diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 872d965..3f92fe7 100644 +index 872d9659..3f92fe75 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -109,18 +109,12 @@ public class EntityTNTPrimed extends Entity { @@ -260,5 +260,5 @@ index 872d965..3f92fe7 100644 } -- -2.6.4 +2.23.0 diff --git a/patches/server/0031-Expose-watchers-in-PacketPlayOutEntityMetadata.patch b/patches/server/0031-Expose-watchers-in-PacketPlayOutEntityMetadata.patch index 19b1e76..c721651 100644 --- a/patches/server/0031-Expose-watchers-in-PacketPlayOutEntityMetadata.patch +++ b/patches/server/0031-Expose-watchers-in-PacketPlayOutEntityMetadata.patch @@ -1,14 +1,14 @@ -From 1086de675f44640944dc68f9ca93092f8a2a79e5 Mon Sep 17 00:00:00 2001 +From 4a4598f2f7051d9e824a9c89d11fc22d2cca317f Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Fri, 7 Jul 2017 19:48:46 -0500 Subject: [PATCH] Expose watchers in PacketPlayOutEntityMetadata --- - .../java/net/minecraft/server/PacketPlayOutEntityMetadata.java | 8 ++------ + .../net/minecraft/server/PacketPlayOutEntityMetadata.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java b/src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java -index c5be70f..043ce66 100644 +index c5be70f8..043ce662 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java @@ -5,8 +5,8 @@ import java.util.List; @@ -32,5 +32,5 @@ index c5be70f..043ce66 100644 - } } -- -2.6.4 +2.23.0 diff --git a/pom.xml b/pom.xml index f82d0ac..b6d81de 100644 --- a/pom.xml +++ b/pom.xml @@ -23,10 +23,6 @@ sonatype-repo https://oss.sonatype.org/content/groups/public/ - - avicus-public - https://repo.avicus.net/content/groups/private/ -