From f982156842cbb5e9f9196b710fec77818b448bc5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Dec 2017 14:11:51 +1100 Subject: [PATCH] Add BungeeCord Chat API support to BookMeta. --- .../0002-Skeleton-API-Implementations.patch | 24 +++++- Bukkit-Patches/0007-Add-Particle-API.patch | 6 +- .../0018-Silenceable-Lightning-API.patch | 6 +- Bukkit-Patches/0024-BungeeCord-Chat-API.patch | 85 +++++++++++++++++- .../0002-Skeleton-API-Implementations.patch | 25 +++++- .../0008-Async-Operation-Catching.patch | 28 +++--- CraftBukkit-Patches/0048-Particle-API.patch | 8 +- .../0055-Improve-AutoSave-Mechanism.patch | 6 +- ...-Implement-Silenceable-Lightning-API.patch | 6 +- ...s-ocelots-when-plugins-spawn-ocelots.patch | 6 +- .../0118-Add-Hunger-Config-Values.patch | 8 +- .../0124-BungeeCord-Chat-API.patch | 86 ++++++++++++++++++- .../0132-Implement-SpawnerSpawnEvent.patch | 6 +- 13 files changed, 251 insertions(+), 49 deletions(-) diff --git a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch index a24d6f8b..503d979b 100644 --- a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 944057f1a35805f805d4d260268918f57dc140f6 Mon Sep 17 00:00:00 2001 +From 826aaee9e540c65af187b27e6db9a260fb32ecfd Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 15 May 2017 15:16:15 +1000 Subject: [PATCH] Skeleton API Implementations @@ -37,10 +37,10 @@ index 5f88b720..1e8c1845 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index f34b3a93..a2082ee1 100644 +index c8344c6d..2d4174c9 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1458,6 +1458,14 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1470,6 +1470,14 @@ public interface World extends PluginMessageRecipient, Metadatable { */ public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data); @@ -146,6 +146,24 @@ index 33f6e6dc..8423104b 100644 + + @Override + Spigot spigot(); ++ // Spigot end + } +diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java +index d66e3f59..3b6bf419 100644 +--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java ++++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java +@@ -173,4 +173,13 @@ public interface BookMeta extends ItemMeta { + int getPageCount(); + + BookMeta clone(); ++ ++ // Spigot start ++ public class Spigot extends ItemMeta.Spigot { ++ ++ } ++ ++ @Override ++ Spigot spigot(); + // Spigot end } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java diff --git a/Bukkit-Patches/0007-Add-Particle-API.patch b/Bukkit-Patches/0007-Add-Particle-API.patch index 0db0ff62..ab6f2653 100644 --- a/Bukkit-Patches/0007-Add-Particle-API.patch +++ b/Bukkit-Patches/0007-Add-Particle-API.patch @@ -1,4 +1,4 @@ -From 8bc99fe18e2f77362701e877252fc37316dc1f19 Mon Sep 17 00:00:00 2001 +From 1184adf091d749842cda4a379575d02ab8ab61e6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:57:09 +1000 Subject: [PATCH] Add Particle API @@ -344,10 +344,10 @@ index 21f7db58..eeb25812 100644 + public enum Type {SOUND, VISUAL, PARTICLE} } diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index a2082ee1..5d21aa97 100644 +index 2d4174c9..90159bcc 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1462,6 +1462,51 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1474,6 +1474,51 @@ public interface World extends PluginMessageRecipient, Metadatable { public class Spigot { diff --git a/Bukkit-Patches/0018-Silenceable-Lightning-API.patch b/Bukkit-Patches/0018-Silenceable-Lightning-API.patch index d0812cac..a2abff6c 100644 --- a/Bukkit-Patches/0018-Silenceable-Lightning-API.patch +++ b/Bukkit-Patches/0018-Silenceable-Lightning-API.patch @@ -1,14 +1,14 @@ -From 7901a0da28cdc8d66896a2f18aafe38c8aced6d2 Mon Sep 17 00:00:00 2001 +From 8c6a1367a4a6e870586208e92cd65c196336fccc Mon Sep 17 00:00:00 2001 From: drXor 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 5d21aa97..67b0d516 100644 +index 90159bcc..9b6eb48f 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -1507,6 +1507,30 @@ public interface World extends PluginMessageRecipient, Metadatable { +@@ -1519,6 +1519,30 @@ public interface World extends PluginMessageRecipient, Metadatable { { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Bukkit-Patches/0024-BungeeCord-Chat-API.patch b/Bukkit-Patches/0024-BungeeCord-Chat-API.patch index 6c430c15..d41b58b1 100644 --- a/Bukkit-Patches/0024-BungeeCord-Chat-API.patch +++ b/Bukkit-Patches/0024-BungeeCord-Chat-API.patch @@ -1,11 +1,11 @@ -From b4993fdbf99bdd01cae7655b17a021a45486a322 Mon Sep 17 00:00:00 2001 +From 0c0f8524631e66adf7d61546c8ae6ecc49c92817 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 02:59:14 +0100 Subject: [PATCH] BungeeCord Chat API diff --git a/pom.xml b/pom.xml -index c2d61041..4221e017 100644 +index c731d340..8ee129d9 100644 --- a/pom.xml +++ b/pom.xml @@ -76,6 +76,14 @@ @@ -364,6 +364,87 @@ index 8584437d..8af5f849 100644 + } } + @Override +diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java +index 3b6bf419..75b03ac3 100644 +--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java ++++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java +@@ -1,6 +1,7 @@ + package org.bukkit.inventory.meta; + + import java.util.List; ++import net.md_5.bungee.api.chat.BaseComponent; + + import org.bukkit.Material; + +@@ -177,6 +178,68 @@ public interface BookMeta extends ItemMeta { + // Spigot start + public class Spigot extends ItemMeta.Spigot { + ++ /** ++ * Gets the specified page in the book. The given page must exist. ++ * ++ * @param page the page number to get ++ * @return the page from the book ++ */ ++ public BaseComponent[] getPage(int page) { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ /** ++ * Sets the specified page in the book. Pages of the book must be ++ * contiguous. ++ *

++ * The data can be up to 256 characters in length, additional characters ++ * are truncated. ++ * ++ * @param page the page number to set ++ * @param data the data to set for that page ++ */ ++ public void setPage(int page, BaseComponent... data) { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ /** ++ * Gets all the pages in the book. ++ * ++ * @return list of all the pages in the book ++ */ ++ public List getPages() { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ /** ++ * Clears the existing book pages, and sets the book to use the provided ++ * pages. Maximum 50 pages with 256 characters per page. ++ * ++ * @param pages A list of pages to set the book to use ++ */ ++ public void setPages(List pages) { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ /** ++ * Clears the existing book pages, and sets the book to use the provided ++ * pages. Maximum 50 pages with 256 characters per page. ++ * ++ * @param pages A list of component arrays, each being a page ++ */ ++ public void setPages(BaseComponent[]... pages) { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ /** ++ * Adds new pages to the end of the book. Up to a maximum of 50 pages ++ * with 256 characters per page. ++ * ++ * @param pages A list of component arrays, each being a page ++ */ ++ public void addPage(BaseComponent[]... pages) { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } + } + @Override -- 2.14.1 diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch index 2cf0287a..ae3b2f94 100644 --- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 02a17780129e737e4a2f6e193e25f57f1fc29e29 Mon Sep 17 00:00:00 2001 +From ce6ed67d68e56bc6b2379c2b00dcfff97a10d26e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -25,10 +25,10 @@ index c0ebdf1a8..314ce9a31 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1941e3a20..d1eb1e8f4 100644 +index 8f6653f77..e6ecabced 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1557,4 +1557,14 @@ public class CraftWorld implements World { +@@ -1564,4 +1564,14 @@ public class CraftWorld implements World { cps.unload(chunk); } } @@ -158,6 +158,25 @@ index 9747a8866..4db27bf9f 100644 + { + return spigot; + } ++ // Spigot end + } +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +index 441632bb3..27170814d 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +@@ -355,4 +355,14 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { + + return builder; + } ++ ++ // Spigot start ++ private final BookMeta.Spigot spigot = new BookMeta.Spigot() { ++ }; ++ ++ @Override ++ public BookMeta.Spigot spigot() { ++ return spigot; ++ } + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java diff --git a/CraftBukkit-Patches/0008-Async-Operation-Catching.patch b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch index b1c4e7dc..e54f928d 100644 --- a/CraftBukkit-Patches/0008-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From 3f66fe3920088d3b18d771d18c618d3d0470e51d Mon Sep 17 00:00:00 2001 +From d5caa600c43da87f40acf61c2cc05c75cb72c06e Mon Sep 17 00:00:00 2001 From: md_5 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/Block.java b/src/main/java/net/minecraft/server/Block.java -index 76bfeafe..2dca6dbc 100644 +index 76bfeafe6..2dca6dbcb 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -315,9 +315,13 @@ public class Block { @@ -26,7 +26,7 @@ index 76bfeafe..2dca6dbc 100644 public int a(Random random) { return 1; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 87243e26..cc037988 100644 +index 87243e266..cc037988f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -668,6 +668,7 @@ public abstract class EntityLiving extends Entity { @@ -38,7 +38,7 @@ index 87243e26..cc037988 100644 if (isTickingEffects) { effectsToProcess.add(mobeffect); diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index a23a33b5..fe699860 100644 +index a23a33b5d..fe699860a 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -105,6 +105,7 @@ public class EntityTracker { @@ -58,7 +58,7 @@ index a23a33b5..fe699860 100644 EntityPlayer entityplayer = (EntityPlayer) entity; Iterator iterator = this.c.iterator(); diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index a68b8a5b..d864c774 100644 +index a68b8a5ba..d864c7745 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -324,6 +324,7 @@ public class EntityTrackerEntry { @@ -78,7 +78,7 @@ index a68b8a5b..d864c774 100644 this.trackedPlayers.remove(entityplayer); this.tracker.c(entityplayer); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 91df4dfe..b043266b 100644 +index 91df4dfed..b043266be 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -973,6 +973,7 @@ public abstract class World implements IBlockAccess { @@ -114,10 +114,10 @@ index 91df4dfe..b043266b 100644 // this.entityList.addAll(collection); Iterator iterator = collection.iterator(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d1eb1e8f..d8dd70d9 100644 +index e6ecabced..5a5b9260a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -172,6 +172,7 @@ public class CraftWorld implements World { +@@ -179,6 +179,7 @@ public class CraftWorld implements World { } public boolean unloadChunkRequest(int x, int z, boolean safe) { @@ -125,7 +125,7 @@ index d1eb1e8f..d8dd70d9 100644 if (safe && isChunkInUse(x, z)) { return false; } -@@ -185,6 +186,7 @@ public class CraftWorld implements World { +@@ -192,6 +193,7 @@ public class CraftWorld implements World { } public boolean unloadChunk(int x, int z, boolean save, boolean safe) { @@ -133,7 +133,7 @@ index d1eb1e8f..d8dd70d9 100644 if (isChunkInUse(x, z)) { return false; } -@@ -255,6 +257,7 @@ public class CraftWorld implements World { +@@ -262,6 +264,7 @@ public class CraftWorld implements World { } public boolean loadChunk(int x, int z, boolean generate) { @@ -142,7 +142,7 @@ index d1eb1e8f..d8dd70d9 100644 if (generate) { // Use the default variant of loadChunk when generate == true. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index aebb7725..9bc317bd 100644 +index 4db27bf9f..dc072aaf8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -154,7 +154,7 @@ index aebb7725..9bc317bd 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 69fcb108..3992c716 100644 +index 69fcb1082..3992c7165 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -42,6 +42,7 @@ public final class CraftScoreboardManager implements ScoreboardManager { @@ -166,7 +166,7 @@ index 69fcb108..3992c716 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 ae3481ba..a0cdd231 100644 +index ae3481ba8..a0cdd2317 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -13,6 +13,7 @@ public class ServerShutdownThread extends Thread { @@ -179,7 +179,7 @@ index ae3481ba..a0cdd231 100644 ex.printStackTrace(); diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java new file mode 100644 -index 00000000..4b3aa85c +index 000000000..4b3aa85c9 --- /dev/null +++ b/src/main/java/org/spigotmc/AsyncCatcher.java @@ -0,0 +1,17 @@ diff --git a/CraftBukkit-Patches/0048-Particle-API.patch b/CraftBukkit-Patches/0048-Particle-API.patch index 90f46f98..fb97d438 100644 --- a/CraftBukkit-Patches/0048-Particle-API.patch +++ b/CraftBukkit-Patches/0048-Particle-API.patch @@ -1,4 +1,4 @@ -From 9f89946e994b3c2d64c6c45bf8a2cf9f3f42e939 Mon Sep 17 00:00:00 2001 +From efa7529c7c8bc34617b7c2937358d227c2d04c9f Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -19,10 +19,10 @@ index 16721835a..352ff3af9 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d8dd70d94..7b0571255 100644 +index 5a5b9260a..d1152d412 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -833,28 +833,18 @@ public class CraftWorld implements World { +@@ -840,28 +840,18 @@ public class CraftWorld implements World { Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); } @@ -60,7 +60,7 @@ index d8dd70d94..7b0571255 100644 } public T spawn(Location location, Class clazz) throws IllegalArgumentException { -@@ -1563,6 +1553,70 @@ public class CraftWorld implements World { +@@ -1570,6 +1560,70 @@ public class CraftWorld implements World { // Spigot start private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0055-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0055-Improve-AutoSave-Mechanism.patch index 6ba35e10..7350279f 100644 --- a/CraftBukkit-Patches/0055-Improve-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0055-Improve-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From 502a31e8d7099811f347c27ce1055d8a93a34b29 Mon Sep 17 00:00:00 2001 +From 63e6763ddb5830be0fa6855259617a999ded7756 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 21:07:18 +1100 Subject: [PATCH] Improve AutoSave Mechanism @@ -60,10 +60,10 @@ index fede33187..d84cb5a1b 100644 SpigotTimings.worldSaveTimer.stopTiming(); // Spigot } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7b0571255..8dae24dfa 100644 +index d1152d412..120fc2fb5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -735,12 +735,17 @@ public class CraftWorld implements World { +@@ -742,12 +742,17 @@ public class CraftWorld implements World { } public void save() { diff --git a/CraftBukkit-Patches/0068-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0068-Implement-Silenceable-Lightning-API.patch index 8fe47e00..1feba245 100644 --- a/CraftBukkit-Patches/0068-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0068-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 58602d352393887ec01d2ce43c4a8bc9e140a30d Mon Sep 17 00:00:00 2001 +From 179258d8d4af4602eded12d2bce822ef3b36d151 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API @@ -40,10 +40,10 @@ index a61531ad2..acb3408d5 100644 // this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dG, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F); float pitch = 0.8F + this.random.nextFloat() * 0.2F; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 8dae24dfa..469c6688f 100644 +index 120fc2fb5..5c553936b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1622,6 +1622,22 @@ public class CraftWorld implements World { +@@ -1629,6 +1629,22 @@ public class CraftWorld implements World { { CraftWorld.this.playEffect( location, effect, 0 ); } diff --git a/CraftBukkit-Patches/0106-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0106-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index d41ca53f..8cf634fa 100644 --- a/CraftBukkit-Patches/0106-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0106-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From a7b7fa5beb494aeccc4a319b79b661d75709022c Mon Sep 17 00:00:00 2001 +From 070bf60651b71f0def6edcf85de974c1c246470c Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 12:49:48 +0100 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots @@ -26,10 +26,10 @@ index ee8f07fcc..5a76821ea 100644 EntityOcelot entityocelot = new EntityOcelot(this.world); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 469c6688f..eb6f24e73 100644 +index 5c553936b..ef8165da4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1182,6 +1182,12 @@ public class CraftWorld implements World { +@@ -1189,6 +1189,12 @@ public class CraftWorld implements World { } if (entity != null) { diff --git a/CraftBukkit-Patches/0118-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0118-Add-Hunger-Config-Values.patch index bdd3fd22..b3a97e11 100644 --- a/CraftBukkit-Patches/0118-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0118-Add-Hunger-Config-Values.patch @@ -1,11 +1,11 @@ -From e15c233f4cbb5e23b240da0272a9dde8c0504428 Mon Sep 17 00:00:00 2001 +From 95b24a3ed0972ffa722b83f81bb4f34c37c40b7e Mon Sep 17 00:00:00 2001 From: lazertester 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 8d8a3c127..9643181fe 100644 +index e516d37bb..c374efd79 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1126,7 +1126,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -29,7 +29,7 @@ index 8d8a3c127..9643181fe 100644 } } -@@ -1437,13 +1437,13 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1441,13 +1441,13 @@ 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.q, i); @@ -45,7 +45,7 @@ index 8d8a3c127..9643181fe 100644 } } else if (this.m_()) { if (d1 > 0.0D) { -@@ -1454,13 +1454,13 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1458,13 +1458,13 @@ public abstract class EntityHuman extends EntityLiving { if (i > 0) { if (this.isSprinting()) { this.a(StatisticList.l, i); diff --git a/CraftBukkit-Patches/0124-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0124-BungeeCord-Chat-API.patch index 8e147ac6..0bc8b623 100644 --- a/CraftBukkit-Patches/0124-BungeeCord-Chat-API.patch +++ b/CraftBukkit-Patches/0124-BungeeCord-Chat-API.patch @@ -1,4 +1,4 @@ -From 8937621a81ab87fe222d9e815a3dd1d0253ad411 Mon Sep 17 00:00:00 2001 +From 69fe0869f1798aa06a037bf1f9c7d5d73cc14f15 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 13 Dec 2014 03:06:05 +0100 Subject: [PATCH] BungeeCord Chat API @@ -158,6 +158,90 @@ index 7e14dd866..945a2d271 100644 }; public Player.Spigot spigot() +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +index a3fd23da1..6fab8cd17 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +@@ -25,6 +25,9 @@ import org.bukkit.craftbukkit.util.CraftChatMessage; + + // Spigot start + import static org.spigotmc.ValidateUtils.*; ++import net.md_5.bungee.api.chat.BaseComponent; ++import net.md_5.bungee.chat.ComponentSerializer; ++import net.minecraft.server.ChatBaseComponent; + // Spigot end + + @DelegateDeserialization(SerializableMeta.class) +@@ -362,6 +365,69 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { + + // Spigot start + private final BookMeta.Spigot spigot = new BookMeta.Spigot() { ++ ++ @Override ++ public BaseComponent[] getPage(final int page) { ++ Validate.isTrue(isValidPage(page), "Invalid page number"); ++ return ComponentSerializer.parse(IChatBaseComponent.ChatSerializer.a(pages.get(page - 1))); ++ } ++ ++ @Override ++ public void setPage(final int page, final BaseComponent... text) { ++ if (!isValidPage(page)) { ++ throw new IllegalArgumentException("Invalid page number " + page + "/" + pages.size()); ++ } ++ ++ BaseComponent[] newText = text == null ? new BaseComponent[0] : text; ++ CraftMetaBook.this.pages.set(page - 1, IChatBaseComponent.ChatSerializer.a(ComponentSerializer.toString(newText))); ++ } ++ ++ @Override ++ public void setPages(final BaseComponent[]... pages) { ++ CraftMetaBook.this.pages.clear(); ++ ++ addPage(pages); ++ } ++ ++ @Override ++ public void addPage(final BaseComponent[]... pages) { ++ for (BaseComponent[] page : pages) { ++ if (CraftMetaBook.this.pages.size() >= MAX_PAGES) { ++ return; ++ } ++ ++ if (page == null) { ++ page = new BaseComponent[0]; ++ } ++ ++ CraftMetaBook.this.pages.add(IChatBaseComponent.ChatSerializer.a(ComponentSerializer.toString(page))); ++ } ++ } ++ ++ @Override ++ public List getPages() { ++ final List copy = ImmutableList.copyOf(CraftMetaBook.this.pages); ++ return new AbstractList() { ++ ++ @Override ++ public BaseComponent[] get(int index) { ++ return ComponentSerializer.parse(IChatBaseComponent.ChatSerializer.a(copy.get(index))); ++ } ++ ++ @Override ++ public int size() { ++ return copy.size(); ++ } ++ }; ++ } ++ ++ @Override ++ public void setPages(List pages) { ++ CraftMetaBook.this.pages.clear(); ++ for (BaseComponent[] page : pages) { ++ addPage(page); ++ } ++ } + }; + + @Override -- 2.14.1 diff --git a/CraftBukkit-Patches/0132-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0132-Implement-SpawnerSpawnEvent.patch index 28a61e6f..c45d01b0 100644 --- a/CraftBukkit-Patches/0132-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0132-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From da57a810d34f2bba8c182c49710e96d503b52566 Mon Sep 17 00:00:00 2001 +From a1d63483b3d1c8560bdf11f6bbfdc458b0bf774c Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 3 Mar 2016 19:45:46 +1100 Subject: [PATCH] Implement SpawnerSpawnEvent. @@ -19,10 +19,10 @@ index 439810bc4..e87f90474 100644 ChunkRegionLoader.a(entity, world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit world.triggerEffect(2004, blockposition, 0); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 1f8f580f6..e13200fb4 100644 +index c4bc628bc..bc84dd30f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1008,6 +1008,21 @@ public class CraftEventFactory { +@@ -1017,6 +1017,21 @@ public class CraftEventFactory { return event; }