diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch index 318463d14a..f2e1cbcce9 100644 --- a/Spigot-API-Patches/0003-Timings-v2.patch +++ b/Spigot-API-Patches/0003-Timings-v2.patch @@ -1,4 +1,4 @@ -From 64f62bc4e2c8b60a6679fbcc608d1a5ee8fe7944 Mon Sep 17 00:00:00 2001 +From 0644771327501a754ae14c834e50fc97f6417085 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -2296,6 +2296,47 @@ index 00000000..5edaba12 + super.stopTiming(); + } +} +diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java +new file mode 100644 +index 00000000..23ac07f2 +--- /dev/null ++++ b/src/main/java/co/aikar/util/Counter.java +@@ -0,0 +1,35 @@ ++package co.aikar.util; ++ ++import com.google.common.collect.ForwardingMap; ++ ++import java.util.HashMap; ++import java.util.Map; ++ ++public class Counter extends ForwardingMap { ++ private final Map counts = new HashMap<>(); ++ ++ public long decrement(T key) { ++ return increment(key, -1); ++ } ++ public long increment(T key) { ++ return increment(key, 1); ++ } ++ public long decrement(T key, long amount) { ++ return decrement(key, -amount); ++ } ++ public long increment(T key, long amount) { ++ Long count = this.getCount(key); ++ count += amount; ++ this.counts.put(key, count); ++ return count; ++ } ++ ++ public long getCount(T key) { ++ return this.counts.getOrDefault(key, 0L); ++ } ++ ++ @Override ++ protected Map delegate() { ++ return this.counts; ++ } ++} diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java new file mode 100644 index 00000000..96274975 @@ -3032,7 +3073,7 @@ index 00000000..fd452bce + } +} diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index 08a9739f..347d2189 100644 +index 7ca5be84..86c78098 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -32,7 +32,8 @@ public abstract class Command { @@ -3610,7 +3651,7 @@ index 80c6a72e..759c4617 100644 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } else { diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index d7d5ac7b..a657fce5 100644 +index e43db9da..ca9c7796 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -23,7 +23,8 @@ import org.bukkit.plugin.PluginDescriptionFile; @@ -3866,5 +3907,5 @@ index 8d982974..7e89b97b 100644 - } } -- -2.15.1.windows.2 +2.18.0 diff --git a/Spigot-API-Patches/0124-Entity-getChunk-API.patch b/Spigot-API-Patches/0124-Entity-getChunk-API.patch new file mode 100644 index 0000000000..f3d37c49f3 --- /dev/null +++ b/Spigot-API-Patches/0124-Entity-getChunk-API.patch @@ -0,0 +1,34 @@ +From 99dd52878fbaede269af3c5cf38c179688506099 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Wed, 4 Jul 2018 02:25:48 -0400 +Subject: [PATCH] Entity#getChunk API + +Get the chunk the entity is currently registered to + +diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java +index 3ae4de7a..e2a2b78c 100644 +--- a/src/main/java/org/bukkit/entity/Entity.java ++++ b/src/main/java/org/bukkit/entity/Entity.java +@@ -1,5 +1,6 @@ + package org.bukkit.entity; + ++import org.bukkit.Chunk; + import org.bukkit.Location; + import org.bukkit.EntityEffect; + import org.bukkit.Nameable; +@@ -514,5 +515,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable { + * @return True if entity spawned from a mob spawner + */ + boolean fromMobSpawner(); ++ ++ /** ++ * Gets the latest chunk an entity is currently or was in. ++ * ++ * @return The current, or most recent chunk if the entity is invalid (which may load the chunk) ++ */ ++ Chunk getChunk(); + // Paper end + } +-- +2.18.0 + diff --git a/Spigot-Server-Patches/0005-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0005-Add-MinecraftKey-Information-to-Objects.patch new file mode 100644 index 0000000000..7822e2dad5 --- /dev/null +++ b/Spigot-Server-Patches/0005-Add-MinecraftKey-Information-to-Objects.patch @@ -0,0 +1,101 @@ +From 471ff10805ee8ef1b93d19bd05a91b9f372417c9 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Wed, 4 Jul 2018 01:40:13 -0400 +Subject: [PATCH] Add MinecraftKey Information to Objects + +Stores the reference to the objects respective MinecraftKey + +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index ed39b122e..3a8902bf1 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -41,7 +41,7 @@ import org.bukkit.event.entity.EntityPortalEvent; + import org.bukkit.plugin.PluginManager; + // CraftBukkit end + +-public abstract class Entity implements ICommandListener { ++public abstract class Entity implements ICommandListener, KeyedObject { // Paper + + // CraftBukkit start + private static final int CURRENT_LEVEL = 2; +@@ -1702,11 +1702,23 @@ public abstract class Entity implements ICommandListener { + return true; + } + ++ // Paper start ++ public final MinecraftKey entityKey = EntityTypes.getKey(this); ++ public final String entityKeyString = entityKey != null ? entityKey.toString() : null; ++ ++ @Override ++ public MinecraftKey getMinecraftKey() { ++ return entityKey; ++ } ++ ++ @Override ++ public String getMinecraftKeyString() { ++ return entityKeyString; ++ } + @Nullable + public final String getSaveID() { +- MinecraftKey minecraftkey = EntityTypes.a(this); +- +- return minecraftkey == null ? null : minecraftkey.toString(); ++ return entityKeyString; ++ // Paper end + } + + protected abstract void a(NBTTagCompound nbttagcompound); +diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java +new file mode 100644 +index 000000000..61c2b993c +--- /dev/null ++++ b/src/main/java/net/minecraft/server/KeyedObject.java +@@ -0,0 +1,8 @@ ++package net.minecraft.server; ++ ++public interface KeyedObject { ++ MinecraftKey getMinecraftKey(); ++ default String getMinecraftKeyString() { ++ return getMinecraftKey().toString(); ++ } ++} +diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java +index 5a5a588e7..672ba3134 100644 +--- a/src/main/java/net/minecraft/server/TileEntity.java ++++ b/src/main/java/net/minecraft/server/TileEntity.java +@@ -7,7 +7,7 @@ import org.apache.logging.log4j.Logger; + import org.spigotmc.CustomTimingsHandler; // Spigot + import org.bukkit.inventory.InventoryHolder; // CraftBukkit + +-public abstract class TileEntity { ++public abstract class TileEntity implements KeyedObject { + + public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot + private static final Logger a = LogManager.getLogger(); +@@ -27,8 +27,21 @@ public abstract class TileEntity { + TileEntity.f.a(new MinecraftKey(s), oclass); + } + +- @Nullable +- public static MinecraftKey a(Class oclass) { ++ // Paper start ++ public final MinecraftKey tileEntityKey = getKey(this.getClass()); ++ public final String tileEntityKeyString = tileEntityKey != null ? tileEntityKey.toString() : null; ++ ++ @Override ++ public MinecraftKey getMinecraftKey() { ++ return tileEntityKey; ++ } ++ ++ @Override ++ public String getMinecraftKeyString() { ++ return tileEntityKeyString; ++ } ++ @Nullable public static MinecraftKey getKey(Class oclass) { return a(oclass); } // Paper - OBFHELPER ++ @Nullable public static MinecraftKey a(Class oclass) { + return (MinecraftKey) TileEntity.f.b(oclass); + } + +-- +2.18.0 + diff --git a/Spigot-Server-Patches/0006-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0006-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch new file mode 100644 index 0000000000..6b2e2f80dd --- /dev/null +++ b/Spigot-Server-Patches/0006-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch @@ -0,0 +1,137 @@ +From b55307c8ea1237c0893145e14f48e2e98a68fc5b Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Wed, 4 Jul 2018 02:10:36 -0400 +Subject: [PATCH] Store reference to current Chunk for Entity and Block + Entities + +This enables us a fast reference to the entities current chunk instead +of having to look it up by hashmap lookups. + +diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java +index 4bbebb25a..b40e60942 100644 +--- a/src/main/java/net/minecraft/server/Chunk.java ++++ b/src/main/java/net/minecraft/server/Chunk.java +@@ -33,6 +33,30 @@ public class Chunk { + private boolean m; + public final Map tileEntities; + public final List[] entitySlices; // Spigot ++ // Paper start ++ private class TileEntityHashMap extends java.util.HashMap { ++ @Override ++ public TileEntity put(BlockPosition key, TileEntity value) { ++ TileEntity replaced = super.put(key, value); ++ if (replaced != null) { ++ replaced.setCurrentChunk(null); ++ } ++ if (value != null) { ++ value.setCurrentChunk(Chunk.this); ++ } ++ return replaced; ++ } ++ ++ @Override ++ public TileEntity remove(Object key) { ++ TileEntity removed = super.remove(key); ++ if (removed != null) { ++ removed.setCurrentChunk(null); ++ } ++ return removed; ++ } ++ } ++ // Paper end + private boolean done; + private boolean lit; + private boolean r; +@@ -80,7 +104,7 @@ public class Chunk { + this.g = new byte[256]; + this.h = new int[256]; + this.i = new boolean[256]; +- this.tileEntities = Maps.newHashMap(); ++ this.tileEntities = new TileEntityHashMap(); // Paper + this.x = 4096; + this.y = Queues.newConcurrentLinkedQueue(); + this.entitySlices = (List[]) (new List[16]); // Spigot +@@ -624,6 +648,9 @@ public class Chunk { + this.entityCount.adjustOrPutValue( creatureType.a(), 1, 1 ); + } + } ++ // Paper start ++ entity.setCurrentChunk(this); ++ // Paper end + // Spigot end + } + +@@ -656,6 +683,9 @@ public class Chunk { + this.entityCount.adjustValue( creatureType.a(), -1 ); + } + } ++ // Paper start ++ entity.setCurrentChunk(null); ++ // Paper end + // Spigot end + } + +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index 3a8902bf1..3829c8c40 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -1703,6 +1703,13 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper + } + + // Paper start ++ private java.lang.ref.WeakReference currentChunk = null; ++ public Chunk getCurrentChunk() { ++ return currentChunk != null ? currentChunk.get() : null; ++ } ++ public void setCurrentChunk(Chunk chunk) { ++ this.currentChunk = chunk != null ? new java.lang.ref.WeakReference<>(chunk) : null; ++ } + public final MinecraftKey entityKey = EntityTypes.getKey(this); + public final String entityKeyString = entityKey != null ? entityKey.toString() : null; + +diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java +index 672ba3134..88cd5734d 100644 +--- a/src/main/java/net/minecraft/server/TileEntity.java ++++ b/src/main/java/net/minecraft/server/TileEntity.java +@@ -28,6 +28,13 @@ public abstract class TileEntity implements KeyedObject { + } + + // Paper start ++ private java.lang.ref.WeakReference currentChunk = null; ++ public Chunk getCurrentChunk() { ++ return currentChunk != null ? currentChunk.get() : null; ++ } ++ public void setCurrentChunk(Chunk chunk) { ++ this.currentChunk = chunk != null ? new java.lang.ref.WeakReference<>(chunk) : null; ++ } + public final MinecraftKey tileEntityKey = getKey(this.getClass()); + public final String tileEntityKeyString = tileEntityKey != null ? tileEntityKey.toString() : null; + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +index c5a194ffe..833e3111d 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +@@ -9,6 +9,7 @@ import java.util.UUID; + + import net.minecraft.server.*; + ++import org.bukkit.Chunk; + import org.bukkit.EntityEffect; + import org.bukkit.Location; + import org.bukkit.Server; +@@ -39,6 +40,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { + this.entity = entity; + } + ++ @Override ++ public Chunk getChunk() { ++ net.minecraft.server.Chunk currentChunk = entity.getCurrentChunk(); ++ return currentChunk != null ? currentChunk.bukkitChunk : getLocation().getChunk(); ++ } ++ + public static CraftEntity getEntity(CraftServer server, Entity entity) { + /** + * Order is *EXTREMELY* important -- keep it right! =D +-- +2.18.0 + diff --git a/Spigot-Server-Patches/0007-Store-counts-for-each-Entity-Block-Entity-Type.patch b/Spigot-Server-Patches/0007-Store-counts-for-each-Entity-Block-Entity-Type.patch new file mode 100644 index 0000000000..56f8ca0add --- /dev/null +++ b/Spigot-Server-Patches/0007-Store-counts-for-each-Entity-Block-Entity-Type.patch @@ -0,0 +1,58 @@ +From 9638089fa0dcff84f21fc77d17a984b430eb3423 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Wed, 4 Jul 2018 02:13:59 -0400 +Subject: [PATCH] Store counts for each Entity/Block Entity Type + +Opens door for future patches to optimize performance + +diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java +index b40e60942..952c96c0c 100644 +--- a/src/main/java/net/minecraft/server/Chunk.java ++++ b/src/main/java/net/minecraft/server/Chunk.java +@@ -34,15 +34,19 @@ public class Chunk { + public final Map tileEntities; + public final List[] entitySlices; // Spigot + // Paper start ++ public final co.aikar.util.Counter entityCounts = new co.aikar.util.Counter<>(); ++ public final co.aikar.util.Counter tileEntityCounts = new co.aikar.util.Counter<>(); + private class TileEntityHashMap extends java.util.HashMap { + @Override + public TileEntity put(BlockPosition key, TileEntity value) { + TileEntity replaced = super.put(key, value); + if (replaced != null) { + replaced.setCurrentChunk(null); ++ tileEntityCounts.decrement(replaced.tileEntityKeyString); + } + if (value != null) { + value.setCurrentChunk(Chunk.this); ++ tileEntityCounts.increment(value.tileEntityKeyString); + } + return replaced; + } +@@ -52,6 +56,7 @@ public class Chunk { + TileEntity removed = super.remove(key); + if (removed != null) { + removed.setCurrentChunk(null); ++ tileEntityCounts.decrement(removed.tileEntityKeyString); + } + return removed; + } +@@ -650,6 +655,7 @@ public class Chunk { + } + // Paper start + entity.setCurrentChunk(this); ++ entityCounts.increment(entity.entityKeyString); + // Paper end + // Spigot end + } +@@ -685,6 +691,7 @@ public class Chunk { + } + // Paper start + entity.setCurrentChunk(null); ++ entityCounts.decrement(entity.entityKeyString); + // Paper end + // Spigot end + } +-- +2.18.0 + diff --git a/Spigot-Server-Patches/0005-MC-Utils.patch b/Spigot-Server-Patches/0008-MC-Utils.patch similarity index 99% rename from Spigot-Server-Patches/0005-MC-Utils.patch rename to Spigot-Server-Patches/0008-MC-Utils.patch index 7acf72df44..c7fd99a993 100644 --- a/Spigot-Server-Patches/0005-MC-Utils.patch +++ b/Spigot-Server-Patches/0008-MC-Utils.patch @@ -1,11 +1,11 @@ -From 7d617689162687744920577469a5bda672cd0e99 Mon Sep 17 00:00:00 2001 +From 5e79bbc7dee8f1a2e42930e6899b7cf8e928b548 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:55:47 -0400 Subject: [PATCH] MC Utils diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 4bbebb25a..c4d9344a7 100644 +index 952c96c0c..cbb1f2cae 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -20,7 +20,7 @@ import org.bukkit.Server; // CraftBukkit @@ -17,7 +17,7 @@ index 4bbebb25a..c4d9344a7 100644 private final ChunkSection[] sections; private final byte[] g; private final int[] h; -@@ -675,6 +675,7 @@ public class Chunk { +@@ -712,6 +712,7 @@ public class Chunk { return !block.isTileEntity() ? null : ((ITileEntity) block).a(this.world, iblockdata.getBlock().toLegacyData(iblockdata)); } diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch similarity index 99% rename from Spigot-Server-Patches/0006-Timings-v2.patch rename to Spigot-Server-Patches/0009-Timings-v2.patch index 41d388f26d..4078405295 100644 --- a/Spigot-Server-Patches/0006-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1,4 +1,4 @@ -From 2c913b7c57722b5fc2e43d952dddf30fc0d3b172 Mon Sep 17 00:00:00 2001 +From fef89f722e865197552f6950ab3cd6a2a74961fa Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -442,10 +442,10 @@ index 2dca6dbcb..352310960 100644 public static int getId(Block block) { return Block.REGISTRY.a(block); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index c4d9344a7..350e0991d 100644 +index cbb1f2cae..ca5a42377 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -900,7 +900,7 @@ public class Chunk { +@@ -937,7 +937,7 @@ public class Chunk { // CraftBukkit start public void loadNearby(IChunkProvider ichunkprovider, ChunkGenerator chunkgenerator, boolean newChunk) { @@ -454,7 +454,7 @@ index c4d9344a7..350e0991d 100644 Server server = world.getServer(); if (server != null) { /* -@@ -926,7 +926,8 @@ public class Chunk { +@@ -963,7 +963,8 @@ public class Chunk { } } // CraftBukkit end @@ -464,7 +464,7 @@ index c4d9344a7..350e0991d 100644 Chunk chunk = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ - 1); Chunk chunk1 = ichunkprovider.getLoadedChunkAt(this.locX + 1, this.locZ); Chunk chunk2 = ichunkprovider.getLoadedChunkAt(this.locX, this.locZ + 1); -@@ -951,7 +952,7 @@ public class Chunk { +@@ -988,7 +989,7 @@ public class Chunk { chunk4.a(chunkgenerator); } } @@ -473,7 +473,7 @@ index c4d9344a7..350e0991d 100644 } -@@ -1164,6 +1165,7 @@ public class Chunk { +@@ -1201,6 +1202,7 @@ public class Chunk { } public void o() { @@ -481,7 +481,7 @@ index c4d9344a7..350e0991d 100644 this.done = true; this.lit = true; BlockPosition blockposition = new BlockPosition(this.locX << 4, 0, this.locZ << 4); -@@ -1197,6 +1199,7 @@ public class Chunk { +@@ -1234,6 +1236,7 @@ public class Chunk { } } @@ -596,7 +596,7 @@ index e1cb96a88..8f2afcc32 100644 return waitable.get(); } catch (java.util.concurrent.ExecutionException e) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ed39b122e..e09ced1a2 100644 +index 3829c8c40..8dcff9bd4 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -25,7 +25,8 @@ import org.bukkit.block.BlockFace; @@ -609,7 +609,7 @@ index ed39b122e..e09ced1a2 100644 import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.vehicle.VehicleBlockCollisionEvent; -@@ -147,7 +148,7 @@ public abstract class Entity implements ICommandListener { +@@ -147,7 +148,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper public boolean valid; public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only public boolean forceExplosionKnockback; // SPIGOT-949 @@ -618,7 +618,7 @@ index ed39b122e..e09ced1a2 100644 // Spigot start public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this); public final boolean defaultActivationState; -@@ -531,7 +532,6 @@ public abstract class Entity implements ICommandListener { +@@ -531,7 +532,6 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } public void move(EnumMoveType enummovetype, double d0, double d1, double d2) { @@ -626,7 +626,7 @@ index ed39b122e..e09ced1a2 100644 if (this.noclip) { this.a(this.getBoundingBox().d(d0, d1, d2)); this.recalcPosition(); -@@ -925,7 +925,6 @@ public abstract class Entity implements ICommandListener { +@@ -925,7 +925,6 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper this.world.methodProfiler.b(); } @@ -1128,7 +1128,7 @@ index 74e3f42cd..66a80a776 100644 return flag; } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 5a5a588e7..d2d4ff6fb 100644 +index 88cd5734d..c1f657808 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -4,12 +4,13 @@ import javax.annotation.Nullable; @@ -1140,7 +1140,7 @@ index 5a5a588e7..d2d4ff6fb 100644 +import co.aikar.timings.Timing; // Paper import org.bukkit.inventory.InventoryHolder; // CraftBukkit - public abstract class TileEntity { + public abstract class TileEntity implements KeyedObject { - public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot + public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper @@ -1906,5 +1906,5 @@ index 2bd690fdf..38be7ed71 100644 } } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch similarity index 97% rename from Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch rename to Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch index 221692ed66..7fc27a8f93 100644 --- a/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch +++ b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch @@ -1,4 +1,4 @@ -From 0aa1b77dd406ea71f2a15b5bb1cdb479e5f2a13b Mon Sep 17 00:00:00 2001 +From 1f84a29839c470f5bdc16ac91c21a3dccd8650eb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:02:51 -0600 Subject: [PATCH] Configurable cactus and reed natural growth heights @@ -49,5 +49,5 @@ index 57f24f55d..d19dce839 100644 if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch similarity index 97% rename from Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch rename to Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch index 5cf56cb3cc..9e7e46813a 100644 --- a/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch +++ b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch @@ -1,4 +1,4 @@ -From 12d1cdf6353a40f0870d48ccc90a0d216a2b6917 Mon Sep 17 00:00:00 2001 +From 7204f6dc262ca2d75ae865a2a27ea9a89cbd2b86 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:09:16 -0600 Subject: [PATCH] Configurable baby zombie movement speed @@ -45,5 +45,5 @@ index 11c0f24f1..277f1414a 100644 } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch similarity index 96% rename from Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch rename to Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch index 228598cc90..b7c172949b 100644 --- a/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch @@ -1,4 +1,4 @@ -From 614207770d336f0b8fa2db0de7a5bb42ce6d76df Mon Sep 17 00:00:00 2001 +From 00a626d4786a4294acd9328c2b5c05e257f262dc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:14:11 -0600 Subject: [PATCH] Configurable fishing time ranges @@ -35,5 +35,5 @@ index b4d3bcb41..339d1f1b1 100644 } } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch similarity index 98% rename from Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch rename to Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch index a1db38344d..7bd6ce16d6 100644 --- a/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch @@ -1,4 +1,4 @@ -From 82899d1f9c3451994851342b7f27d37fc03b9a0f Mon Sep 17 00:00:00 2001 +From 0e0640641bbc9a2e2089ae1846e2d7899bcd9e5e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:24:16 -0600 Subject: [PATCH] Allow nerfed mobs to jump @@ -81,5 +81,5 @@ index b3b303b3b..fc6c3bf71 100644 if (this.a.getRandom().nextFloat() < 0.8F) { this.a.getControllerJump().a(); -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch similarity index 95% rename from Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch rename to Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch index 6ed80a425d..dac290424f 100644 --- a/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,11 +1,11 @@ -From 2f9986be69c453815c9f2a218ceec0adaca29119 Mon Sep 17 00:00:00 2001 +From 454d4de322b765150a71a124e972aa3853dcb2d5 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 1 Mar 2016 13:51:54 -0600 Subject: [PATCH] Add configurable despawn distances for living entities diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1d9dd0e0..22c1113a 100644 +index 1d9dd0e0b..22c1113a1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -91,4 +91,20 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 1d9dd0e0..22c1113a 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 7b02b253..94967e6b 100644 +index 7b02b253c..94967e6b6 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -630,13 +630,13 @@ public abstract class EntityInsentient extends EntityLiving { @@ -51,5 +51,5 @@ index 7b02b253..94967e6b 100644 } } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch similarity index 92% rename from Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch rename to Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch index 10602b0d5c..3646498223 100644 --- a/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch @@ -1,11 +1,11 @@ -From 6f59e21ac8b3574bd3fe990f51b95928994cbf23 Mon Sep 17 00:00:00 2001 +From 84cf59e1a2697bfa6e9319344d57f2363e4a6b25 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 3 Mar 2016 03:53:43 -0600 Subject: [PATCH] Allow for toggling of spawn chunks diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 22c1113a..0094d1a8 100644 +index 22c1113a1..0094d1a87 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -107,4 +107,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 22c1113a..0094d1a8 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d902e263..759964b0 100644 +index d902e2630..759964b0f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -202,6 +202,7 @@ public abstract class World implements IBlockAccess { @@ -32,5 +32,5 @@ index d902e263..759964b0 100644 this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch similarity index 94% rename from Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch rename to Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch index ac10627732..48555ab0d4 100644 --- a/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch +++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch @@ -1,4 +1,4 @@ -From a25f3ed991c46a871bf580ae4ff7297fa93a4cc7 Mon Sep 17 00:00:00 2001 +From ce52b463a57dd7ff4bc91a569a0da9c9b7080c99 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 14:14:15 -0600 Subject: [PATCH] Drop falling block and tnt entities at the specified height @@ -24,10 +24,10 @@ index 0094d1a87..4da846719 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e09ced1a2..ab206417c 100644 +index 8dcff9bd4..041af8070 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1750,6 +1750,7 @@ public abstract class Entity implements ICommandListener { +@@ -1769,6 +1769,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper return this.a(new ItemStack(item, i, 0), f); } @@ -76,5 +76,5 @@ index 44b2d4735..0d70dd1d2 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch similarity index 97% rename from Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch rename to Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch index 6b6650cf27..12d3df2108 100644 --- a/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0017-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,4 +1,4 @@ -From 57f3356c54cd1823745adc773f6920584bfe4c10 Mon Sep 17 00:00:00 2001 +From 656824f3d0c0f73417897c1ce3391a91849ec476 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 14:27:13 -0600 Subject: [PATCH] Configurable speed for water flowing over lava @@ -57,5 +57,5 @@ index 7b74df5b9..62234a7c9 100644 + } } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch similarity index 98% rename from Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch rename to Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index cd92ac8449..90ef9445f4 100644 --- a/Spigot-Server-Patches/0015-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From 8e05f591df18b178787bbc1417a67f3685f03c79 Mon Sep 17 00:00:00 2001 +From 52755667f1f619ec704fc039220647e7d105956d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -46,7 +46,7 @@ index 9042deed6..33b40ffc2 100644 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 0c5862a3f..e3667e558 100644 +index 96585fb24..f95da9e26 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -192,7 +192,7 @@ public class Main { @@ -93,5 +93,5 @@ index 94a3d4237..91b8aa6a1 100644 log.log( Level.SEVERE, "------------------------------" ); // -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch similarity index 98% rename from Spigot-Server-Patches/0016-Player-affects-spawning-API.patch rename to Spigot-Server-Patches/0019-Player-affects-spawning-API.patch index 65a6487b81..75bede02be 100644 --- a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0019-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 620959a6b7c23480d69b886a164cb12185d59a9f Mon Sep 17 00:00:00 2001 +From 3746d7c662973bd3e53de8da8b75eb5f7e205efd Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API @@ -91,5 +91,5 @@ index 916781403..9e8ca0fbd 100644 // Spigot start -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0017-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0020-Remove-invalid-mob-spawner-tile-entities.patch similarity index 89% rename from Spigot-Server-Patches/0017-Remove-invalid-mob-spawner-tile-entities.patch rename to Spigot-Server-Patches/0020-Remove-invalid-mob-spawner-tile-entities.patch index a654d5359c..f95cf6eea2 100644 --- a/Spigot-Server-Patches/0017-Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/0020-Remove-invalid-mob-spawner-tile-entities.patch @@ -1,14 +1,14 @@ -From c24578957f9f544e023cf837aceadd650feec34e Mon Sep 17 00:00:00 2001 +From f468cbcfc4e7e05e67215e55bb021f4fb1ef1007 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 15:08:03 -0600 Subject: [PATCH] Remove invalid mob spawner tile entities diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 350e0991..66c78083 100644 +index ca5a42377..50113c303 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -722,6 +722,10 @@ public class Chunk { +@@ -759,6 +759,10 @@ public class Chunk { tileentity.A(); this.tileEntities.put(blockposition, tileentity); // CraftBukkit start @@ -20,5 +20,5 @@ index 350e0991..66c78083 100644 System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ() + " (" + org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(getBlockData(blockposition).getBlock()) + ") where there was no entity tile!"); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0018-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0021-Optimize-TileEntity-Ticking.patch similarity index 98% rename from Spigot-Server-Patches/0018-Optimize-TileEntity-Ticking.patch rename to Spigot-Server-Patches/0021-Optimize-TileEntity-Ticking.patch index 967728a5ba..9e1a026f44 100644 --- a/Spigot-Server-Patches/0018-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0021-Optimize-TileEntity-Ticking.patch @@ -1,11 +1,11 @@ -From dcf282ac28b3cca835ce72abf3f69cea9bf4e8ff Mon Sep 17 00:00:00 2001 +From 38c9fb6874ea9a6a93dcb74babdf31dccacb9fde Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 22:01:19 -0600 Subject: [PATCH] Optimize TileEntity Ticking diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index 3b5af473..63130412 100644 +index 3b5af473d..631304122 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -8,17 +8,17 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity; @@ -117,7 +117,7 @@ index 3b5af473..63130412 100644 this.world.applyPhysics(this.position, this.getBlock(), false); diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java -index 31585757..1c1741c5 100644 +index 31585757b..1c1741c56 100644 --- a/src/main/java/net/minecraft/server/TileEntityEnderChest.java +++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java @@ -1,15 +1,17 @@ @@ -186,5 +186,5 @@ index 31585757..1c1741c5 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0019-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0022-Further-improve-server-tick-loop.patch similarity index 98% rename from Spigot-Server-Patches/0019-Further-improve-server-tick-loop.patch rename to Spigot-Server-Patches/0022-Further-improve-server-tick-loop.patch index 7e09cfdbd9..1877fc02f9 100644 --- a/Spigot-Server-Patches/0019-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0022-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From 18e7bb3d26d123c1b7a26e2d0a2b3baa60e5dec2 Mon Sep 17 00:00:00 2001 +From 1e6e7ab651008e3a1077dd86e7ff04563ce9cc97 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 92d48025..47fe9262 100644 +index 92d480251..47fe9262a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -114,16 +114,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -147,7 +147,7 @@ index 92d48025..47fe9262 100644 } lastTick = curTime; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 33b40ffc..bfddd168 100644 +index 33b40ffc2..bfddd1685 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1753,6 +1753,17 @@ public final class CraftServer implements Server { @@ -169,7 +169,7 @@ index 33b40ffc..bfddd168 100644 { diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java -index be2e31de..6d21c326 100644 +index be2e31dea..6d21c3269 100644 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java @@ -1,8 +1,5 @@ @@ -210,5 +210,5 @@ index be2e31de..6d21c326 100644 return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0020-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0023-Only-refresh-abilities-if-needed.patch similarity index 93% rename from Spigot-Server-Patches/0020-Only-refresh-abilities-if-needed.patch rename to Spigot-Server-Patches/0023-Only-refresh-abilities-if-needed.patch index 72d495501b..382b5ebba1 100644 --- a/Spigot-Server-Patches/0020-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0023-Only-refresh-abilities-if-needed.patch @@ -1,4 +1,4 @@ -From 6e552824da89ae526f34323546181e662acf6e3a Mon Sep 17 00:00:00 2001 +From 329aa01be95b29541954ff13d27cf6416159be8b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:12:03 -0600 Subject: [PATCH] Only refresh abilities if needed @@ -24,5 +24,5 @@ index 9e8ca0fbd..44d0db180 100644 @Override -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0021-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0024-Add-async-chunk-load-API.patch similarity index 92% rename from Spigot-Server-Patches/0021-Add-async-chunk-load-API.patch rename to Spigot-Server-Patches/0024-Add-async-chunk-load-API.patch index 63b0030b8f..678569df1e 100644 --- a/Spigot-Server-Patches/0021-Add-async-chunk-load-API.patch +++ b/Spigot-Server-Patches/0024-Add-async-chunk-load-API.patch @@ -1,11 +1,11 @@ -From 60346178095179c691b4c2e164edd907116e3089 Mon Sep 17 00:00:00 2001 +From c3014cb73ff60881596d4127dfbc32e58a3e07a2 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:19:01 -0600 Subject: [PATCH] Add async chunk load API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ef8165da..01fc193d 100644 +index ef8165da4..01fc193db 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -134,6 +134,26 @@ public class CraftWorld implements World { @@ -36,5 +36,5 @@ index ef8165da..01fc193d 100644 return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk; } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0022-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch similarity index 93% rename from Spigot-Server-Patches/0022-Entity-Origin-API.patch rename to Spigot-Server-Patches/0025-Entity-Origin-API.patch index 934cf10102..ed337fe91a 100644 --- a/Spigot-Server-Patches/0022-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch @@ -1,14 +1,14 @@ -From f3036166c54254edda6b097907cff5bc2e1e3639 Mon Sep 17 00:00:00 2001 +From 76865dffb1ead34f79aa346277c16a9b22d88ba0 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ab206417c..e3084445f 100644 +index 041af8070..43b802855 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -149,6 +149,7 @@ public abstract class Entity implements ICommandListener { +@@ -149,6 +149,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only public boolean forceExplosionKnockback; // SPIGOT-949 public Timing tickTimer = MinecraftTimings.getEntityTimings(this); // Paper @@ -16,7 +16,7 @@ index ab206417c..e3084445f 100644 // Spigot start public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this); public final boolean defaultActivationState; -@@ -1545,6 +1546,11 @@ public abstract class Entity implements ICommandListener { +@@ -1545,6 +1546,11 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } } @@ -28,7 +28,7 @@ index ab206417c..e3084445f 100644 return nbttagcompound; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT"); -@@ -1688,6 +1694,13 @@ public abstract class Entity implements ICommandListener { +@@ -1688,6 +1694,13 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } // CraftBukkit end @@ -42,7 +42,7 @@ index ab206417c..e3084445f 100644 } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded"); -@@ -1712,6 +1725,7 @@ public abstract class Entity implements ICommandListener { +@@ -1731,6 +1744,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper protected abstract void b(NBTTagCompound nbttagcompound); @@ -118,10 +118,10 @@ index 26d4bd690..31b765dea 100644 flag = true; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index c5a194ffe..00d842629 100644 +index 833e3111d..6c23e88a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -754,4 +754,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -761,4 +761,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return spigot; } // Spigot end @@ -135,5 +135,5 @@ index c5a194ffe..00d842629 100644 + // Paper end } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0023-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch similarity index 94% rename from Spigot-Server-Patches/0023-Prevent-tile-entity-and-entity-crashes.patch rename to Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch index 13656f41c6..958037bbf5 100644 --- a/Spigot-Server-Patches/0023-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch @@ -1,14 +1,14 @@ -From 5c582595ec7258d05855fe076e4fc24b1e62aeaf Mon Sep 17 00:00:00 2001 +From 277b632fc83ffd69f3a61a439efac380e63ffa4b Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:52:34 -0600 Subject: [PATCH] Prevent tile entity and entity crashes diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index d2d4ff6f..65297a76 100644 +index c1f657808..dfdc55583 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java -@@ -175,7 +175,12 @@ public abstract class TileEntity { +@@ -195,7 +195,12 @@ public abstract class TileEntity implements KeyedObject { } }); if (this.world != null) { @@ -23,7 +23,7 @@ index d2d4ff6f..65297a76 100644 public String a() throws Exception { int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 31b765de..fd5f8102 100644 +index 31b765dea..fd5f8102a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1449,10 +1449,12 @@ public abstract class World implements IBlockAccess { @@ -62,5 +62,5 @@ index 31b765de..fd5f8102 100644 // Spigot start finally { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0024-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch similarity index 91% rename from Spigot-Server-Patches/0024-Configurable-top-of-nether-void-damage.patch rename to Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch index 742a5cb07b..8d9962cc80 100644 --- a/Spigot-Server-Patches/0024-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch @@ -1,11 +1,11 @@ -From c65ba7f6ff965da2d8b2beff4fdaf0fbe65f4091 Mon Sep 17 00:00:00 2001 +From 76648e3954c2467150ff499f71a67f70f8e6f5a4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:58:50 -0600 Subject: [PATCH] Configurable top of nether void damage diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d3484489..bf7af475 100644 +index d3484489b..bf7af475c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -129,4 +129,10 @@ public class PaperWorldConfig { @@ -20,10 +20,10 @@ index d3484489..bf7af475 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 00487dd5..9ee8c40a 100644 +index 43b802855..aadc426fd 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -450,9 +450,15 @@ public abstract class Entity implements ICommandListener { +@@ -450,9 +450,15 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper this.fallDistance *= 0.5F; } @@ -39,7 +39,7 @@ index 00487dd5..9ee8c40a 100644 if (!this.world.isClientSide) { this.setFlag(0, this.fireTicks > 0); -@@ -462,6 +468,18 @@ public abstract class Entity implements ICommandListener { +@@ -462,6 +468,18 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper this.world.methodProfiler.b(); } @@ -58,7 +58,7 @@ index 00487dd5..9ee8c40a 100644 protected void I() { if (this.portalCooldown > 0) { --this.portalCooldown; -@@ -518,6 +536,7 @@ public abstract class Entity implements ICommandListener { +@@ -518,6 +536,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper this.fireTicks = 0; } @@ -67,7 +67,7 @@ index 00487dd5..9ee8c40a 100644 this.die(); } diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 82795ee8..f8da1887 100644 +index a9412d4e0..1f4025486 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -204,9 +204,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT @@ -87,5 +87,5 @@ index 82795ee8..f8da1887 100644 int i; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0025-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch similarity index 90% rename from Spigot-Server-Patches/0025-Check-online-mode-before-converting-and-renaming-pla.patch rename to Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch index 7f84fa768a..9db8fdafef 100644 --- a/Spigot-Server-Patches/0025-Check-online-mode-before-converting-and-renaming-pla.patch +++ b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch @@ -1,11 +1,11 @@ -From b94394ffcc1baf20e676b78eecf2a1773581f0b2 Mon Sep 17 00:00:00 2001 +From a44f81bb9c9cc3fe4d1f2b995c6da771b273ee0a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:03:55 -0600 Subject: [PATCH] Check online mode before converting and renaming player data diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index b69c6cf9..eba1228f 100644 +index b69c6cf97..eba1228fd 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -167,7 +167,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { @@ -18,5 +18,5 @@ index b69c6cf9..eba1228f 100644 file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat"); if ( file.exists() ) -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0026-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch similarity index 91% rename from Spigot-Server-Patches/0026-Always-tick-falling-blocks.patch rename to Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch index abf142c407..391e6b1c5c 100644 --- a/Spigot-Server-Patches/0026-Always-tick-falling-blocks.patch +++ b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch @@ -1,11 +1,11 @@ -From f2a09d0c6b52c8298494189dc30eebe1be91443e Mon Sep 17 00:00:00 2001 +From 44f7b670a109010c9d1e76a06aa48d717bb14b1e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:32:25 -0600 Subject: [PATCH] Always tick falling blocks diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 38be7ed7..3265a6c2 100644 +index 38be7ed71..3265a6c25 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature; @@ -25,5 +25,5 @@ index 38be7ed7..3265a6c2 100644 || entity instanceof EntityFireworks ) { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0027-Lighting-Queue.patch b/Spigot-Server-Patches/0030-Lighting-Queue.patch similarity index 93% rename from Spigot-Server-Patches/0027-Lighting-Queue.patch rename to Spigot-Server-Patches/0030-Lighting-Queue.patch index 0b74563424..3bfe7d0ea5 100644 --- a/Spigot-Server-Patches/0027-Lighting-Queue.patch +++ b/Spigot-Server-Patches/0030-Lighting-Queue.patch @@ -1,4 +1,4 @@ -From 40710ffc3a3e33ad680988e1bace785d72779f99 Mon Sep 17 00:00:00 2001 +From eff7f534ce1d3c0f5c1e12bfae87996f1a22dbcc Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 00:52:31 -0600 Subject: [PATCH] Lighting Queue @@ -6,7 +6,7 @@ Subject: [PATCH] Lighting Queue This provides option to queue lighting updates to ensure they do not cause the server lag diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java -index e0ad559b..4eebd9fa 100644 +index e0ad559b7..4eebd9fae 100644 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -49,6 +49,8 @@ public class WorldTimingsHandler { @@ -27,7 +27,7 @@ index e0ad559b..4eebd9fa 100644 } } diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bf7af475..94a17304 100644 +index bf7af475c..94a173045 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -135,4 +135,10 @@ public class PaperWorldConfig { @@ -42,18 +42,18 @@ index bf7af475..94a17304 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 66c78083..c1f25e8d 100644 +index 50113c303..aaf253c89 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -33,6 +33,7 @@ public class Chunk { - private boolean m; - public final Map tileEntities; - public final List[] entitySlices; // Spigot -+ final PaperLightingQueue.LightingQueue lightingQueue = new PaperLightingQueue.LightingQueue(this); // Paper +@@ -61,6 +61,7 @@ public class Chunk { + return removed; + } + } ++ final PaperLightingQueue.LightingQueue lightingQueue = new PaperLightingQueue.LightingQueue(this); + // Paper end private boolean done; private boolean lit; - private boolean r; -@@ -229,6 +230,13 @@ public class Chunk { +@@ -258,6 +259,13 @@ public class Chunk { private void h(boolean flag) { this.world.methodProfiler.a("recheckGaps"); if (this.world.areChunksLoaded(new BlockPosition(this.locX * 16 + 8, 0, this.locZ * 16 + 8), 16)) { @@ -67,7 +67,7 @@ index 66c78083..c1f25e8d 100644 for (int i = 0; i < 16; ++i) { for (int j = 0; j < 16; ++j) { if (this.i[i + j * 16]) { -@@ -482,6 +490,7 @@ public class Chunk { +@@ -511,6 +519,7 @@ public class Chunk { if (flag) { this.initLighting(); } else { @@ -75,7 +75,7 @@ index 66c78083..c1f25e8d 100644 int j1 = iblockdata.c(); int k1 = iblockdata1.c(); -@@ -496,6 +505,7 @@ public class Chunk { +@@ -525,6 +534,7 @@ public class Chunk { if (j1 != k1 && (j1 < k1 || this.getBrightness(EnumSkyBlock.SKY, blockposition) > 0 || this.getBrightness(EnumSkyBlock.BLOCK, blockposition) > 0)) { this.d(i, k); } @@ -83,7 +83,7 @@ index 66c78083..c1f25e8d 100644 } TileEntity tileentity; -@@ -1340,6 +1350,16 @@ public class Chunk { +@@ -1377,6 +1387,16 @@ public class Chunk { this.w = i; } @@ -101,7 +101,7 @@ index 66c78083..c1f25e8d 100644 IMMEDIATE, QUEUED, CHECK; diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 69ded6aa..e9bc23a6 100644 +index bd006ef74..2b320cbd1 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -295,6 +295,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -113,7 +113,7 @@ index 69ded6aa..e9bc23a6 100644 // Update neighbor counts for (int x = -2; x < 3; x++) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 47fe9262..d63a243f 100644 +index 47fe9262a..d63a243f3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -722,7 +722,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -135,7 +135,7 @@ index 47fe9262..d63a243f 100644 } diff --git a/src/main/java/net/minecraft/server/PaperLightingQueue.java b/src/main/java/net/minecraft/server/PaperLightingQueue.java new file mode 100644 -index 00000000..345cd582 +index 000000000..345cd5824 --- /dev/null +++ b/src/main/java/net/minecraft/server/PaperLightingQueue.java @@ -0,0 +1,92 @@ @@ -232,7 +232,7 @@ index 00000000..345cd582 + } +} diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index fd5f8102..77ed2d24 100644 +index fd5f8102a..77ed2d249 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -391,7 +391,7 @@ public abstract class World implements IBlockAccess { @@ -245,5 +245,5 @@ index fd5f8102..77ed2d24 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0028-Configurable-end-credits.patch b/Spigot-Server-Patches/0031-Configurable-end-credits.patch similarity index 96% rename from Spigot-Server-Patches/0028-Configurable-end-credits.patch rename to Spigot-Server-Patches/0031-Configurable-end-credits.patch index 7804b8ec35..8345019eda 100644 --- a/Spigot-Server-Patches/0028-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0031-Configurable-end-credits.patch @@ -1,4 +1,4 @@ -From ccaca422e71692a8b2741a2df5f4859a90716c11 Mon Sep 17 00:00:00 2001 +From 2a957c68f83983541fb26d90e11944e9f97ec7fa Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Wed, 16 Mar 2016 02:21:39 -0500 Subject: [PATCH] Configurable end credits @@ -41,5 +41,5 @@ index 730acd971..dfaab774d 100644 this.cq = true; } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0029-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0032-Fix-lag-from-explosions-processing-dead-entities.patch similarity index 95% rename from Spigot-Server-Patches/0029-Fix-lag-from-explosions-processing-dead-entities.patch rename to Spigot-Server-Patches/0032-Fix-lag-from-explosions-processing-dead-entities.patch index 15213f2914..dbe9bc64e9 100644 --- a/Spigot-Server-Patches/0029-Fix-lag-from-explosions-processing-dead-entities.patch +++ b/Spigot-Server-Patches/0032-Fix-lag-from-explosions-processing-dead-entities.patch @@ -1,4 +1,4 @@ -From 546315b2c4410127330c66a51e4dc275640dde34 Mon Sep 17 00:00:00 2001 +From 178c570553fa6504bac1ad6233eed59af89f1360 Mon Sep 17 00:00:00 2001 From: Iceee Date: Wed, 2 Mar 2016 01:39:52 -0600 Subject: [PATCH] Fix lag from explosions processing dead entities @@ -25,5 +25,5 @@ index 98c2bdcf7..a1ebcf858 100644 for (int l1 = 0; l1 < list.size(); ++l1) { -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0030-Generator-Settings.patch b/Spigot-Server-Patches/0033-Generator-Settings.patch similarity index 99% rename from Spigot-Server-Patches/0030-Generator-Settings.patch rename to Spigot-Server-Patches/0033-Generator-Settings.patch index 54c5d41274..2d07fcbe61 100644 --- a/Spigot-Server-Patches/0030-Generator-Settings.patch +++ b/Spigot-Server-Patches/0033-Generator-Settings.patch @@ -1,4 +1,4 @@ -From 44be4254d3e0b4553144b3e11ef864c9eaf57d13 Mon Sep 17 00:00:00 2001 +From e894331adaa569423be8472929da3a809c4106bb Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 02:17:54 -0600 Subject: [PATCH] Generator Settings @@ -308,5 +308,5 @@ index 66a80a776..34fd7edfe 100644 ObjectIterator objectiterator = this.c.values().iterator(); -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0031-Optimize-explosions.patch b/Spigot-Server-Patches/0034-Optimize-explosions.patch similarity index 99% rename from Spigot-Server-Patches/0031-Optimize-explosions.patch rename to Spigot-Server-Patches/0034-Optimize-explosions.patch index 390d97dcef..6965d149bf 100644 --- a/Spigot-Server-Patches/0031-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0034-Optimize-explosions.patch @@ -1,4 +1,4 @@ -From 4a3ce0b9f53b9cb651783d272853855f45ac78dd Mon Sep 17 00:00:00 2001 +From 7c6a6c8a4f1efcf9c0319a79cfcc36fc6b700591 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 11:59:48 -0600 Subject: [PATCH] Optimize explosions @@ -156,5 +156,5 @@ index 77ed2d249..fc7315f7d 100644 public CraftWorld getWorld() { return this.world; -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0032-Stop-updating-flowing-block-if-material-has-changed.patch b/Spigot-Server-Patches/0035-Stop-updating-flowing-block-if-material-has-changed.patch similarity index 93% rename from Spigot-Server-Patches/0032-Stop-updating-flowing-block-if-material-has-changed.patch rename to Spigot-Server-Patches/0035-Stop-updating-flowing-block-if-material-has-changed.patch index 2941b53f71..4f65bd99ee 100644 --- a/Spigot-Server-Patches/0032-Stop-updating-flowing-block-if-material-has-changed.patch +++ b/Spigot-Server-Patches/0035-Stop-updating-flowing-block-if-material-has-changed.patch @@ -1,4 +1,4 @@ -From 491235cd2a7ab7a9eaff4d02718c37d657b78167 Mon Sep 17 00:00:00 2001 +From b347181112d7dd6655c11bbd324a2a4c62e9507d Mon Sep 17 00:00:00 2001 From: Iceee Date: Wed, 2 Mar 2016 12:03:23 -0600 Subject: [PATCH] Stop updating flowing block if material has changed @@ -17,5 +17,5 @@ index 62234a7c9..3b47253a4 100644 IBlockData iblockdata2 = world.getType(blockposition.down()); -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0033-Fast-draining.patch b/Spigot-Server-Patches/0036-Fast-draining.patch similarity index 98% rename from Spigot-Server-Patches/0033-Fast-draining.patch rename to Spigot-Server-Patches/0036-Fast-draining.patch index 885882edb0..d9f21d81ee 100644 --- a/Spigot-Server-Patches/0033-Fast-draining.patch +++ b/Spigot-Server-Patches/0036-Fast-draining.patch @@ -1,4 +1,4 @@ -From ebb2e432e50bb6758f584920396ae4ed8ef98b0e Mon Sep 17 00:00:00 2001 +From 4b300fd41621071f122933ad9400521cb46228a0 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 12:20:52 -0600 Subject: [PATCH] Fast draining @@ -109,5 +109,5 @@ index 3b47253a4..3aaa19b2f 100644 + // Paper end } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0034-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0037-Configurable-lava-flow-speed.patch similarity index 97% rename from Spigot-Server-Patches/0034-Configurable-lava-flow-speed.patch rename to Spigot-Server-Patches/0037-Configurable-lava-flow-speed.patch index 927eec0f2b..957ba0f16b 100644 --- a/Spigot-Server-Patches/0034-Configurable-lava-flow-speed.patch +++ b/Spigot-Server-Patches/0037-Configurable-lava-flow-speed.patch @@ -1,4 +1,4 @@ -From f764c07be09e378b2e3561779358108f37bb82f0 Mon Sep 17 00:00:00 2001 +From 2d430fe2949ebdeb5057951e790b9cf0a42704f0 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 12:27:07 -0600 Subject: [PATCH] Configurable lava flow speed @@ -47,5 +47,5 @@ index f3eb2a797..d0265f960 100644 return this.e; } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0035-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0038-Add-player-view-distance-API.patch similarity index 99% rename from Spigot-Server-Patches/0035-Add-player-view-distance-API.patch rename to Spigot-Server-Patches/0038-Add-player-view-distance-API.patch index dd2d9761fb..95fe6c8926 100644 --- a/Spigot-Server-Patches/0035-Add-player-view-distance-API.patch +++ b/Spigot-Server-Patches/0038-Add-player-view-distance-API.patch @@ -1,4 +1,4 @@ -From b37938d4ce59d4ae17feb44e60dd1f8124c1a4d8 Mon Sep 17 00:00:00 2001 +From bc0c7f66ac5a805ce36fbeec388e30315c77e22e Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 14:35:27 -0600 Subject: [PATCH] Add player view distance API @@ -224,5 +224,5 @@ index 44d0db180..b2b707305 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0036-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0039-Disable-explosion-knockback.patch similarity index 98% rename from Spigot-Server-Patches/0036-Disable-explosion-knockback.patch rename to Spigot-Server-Patches/0039-Disable-explosion-knockback.patch index 97262798db..b14cae1341 100644 --- a/Spigot-Server-Patches/0036-Disable-explosion-knockback.patch +++ b/Spigot-Server-Patches/0039-Disable-explosion-knockback.patch @@ -1,4 +1,4 @@ -From 3205346921413de13db17a2fa51e33847237783c Mon Sep 17 00:00:00 2001 +From 8c80dd00564a7e849b0e698664bc59afc86be7f9 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:48:03 -0600 Subject: [PATCH] Disable explosion knockback @@ -70,5 +70,5 @@ index e7f0e84d4..e148901e5 100644 } } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0037-Disable-thunder.patch b/Spigot-Server-Patches/0040-Disable-thunder.patch similarity index 95% rename from Spigot-Server-Patches/0037-Disable-thunder.patch rename to Spigot-Server-Patches/0040-Disable-thunder.patch index 746df12946..51a514758c 100644 --- a/Spigot-Server-Patches/0037-Disable-thunder.patch +++ b/Spigot-Server-Patches/0040-Disable-thunder.patch @@ -1,4 +1,4 @@ -From b00d6ae1ac25b1c2a41cabc1f3cd2cae9bd9fd01 Mon Sep 17 00:00:00 2001 +From d2fc9addb5a311bf9f318eadbec8856814f9f2e3 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder @@ -33,5 +33,5 @@ index 95964c550..b12c58732 100644 l = this.l >> 2; blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0038-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0041-Disable-ice-and-snow.patch similarity index 95% rename from Spigot-Server-Patches/0038-Disable-ice-and-snow.patch rename to Spigot-Server-Patches/0041-Disable-ice-and-snow.patch index 0294ba64d7..92c0735caa 100644 --- a/Spigot-Server-Patches/0038-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0041-Disable-ice-and-snow.patch @@ -1,4 +1,4 @@ -From 54b3b7343bff27759ae9d02430994db91db9b96e Mon Sep 17 00:00:00 2001 +From f87ff63cc88a82e74518b65870af236bbfbec5bb Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow @@ -32,5 +32,5 @@ index b12c58732..d0ff0adf5 100644 l = this.l >> 2; blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0042-Configurable-mob-spawner-tick-rate.patch similarity index 97% rename from Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch rename to Spigot-Server-Patches/0042-Configurable-mob-spawner-tick-rate.patch index 9254b49b22..34b1c6ac17 100644 --- a/Spigot-Server-Patches/0039-Configurable-mob-spawner-tick-rate.patch +++ b/Spigot-Server-Patches/0042-Configurable-mob-spawner-tick-rate.patch @@ -1,4 +1,4 @@ -From 65ef96c994b5143cb8fffada60fade2fa6ce842a Mon Sep 17 00:00:00 2001 +From 7687ee0d8185f0476427df0ce90d6a1f347bd385 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 15:03:53 -0600 Subject: [PATCH] Configurable mob spawner tick rate @@ -64,5 +64,5 @@ index 0149726ea..a5261d70b 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0040-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0043-Send-absolute-position-the-first-time-an-entity-is-s.patch similarity index 97% rename from Spigot-Server-Patches/0040-Send-absolute-position-the-first-time-an-entity-is-s.patch rename to Spigot-Server-Patches/0043-Send-absolute-position-the-first-time-an-entity-is-s.patch index bc2c32f7bf..43bb77bcf0 100644 --- a/Spigot-Server-Patches/0040-Send-absolute-position-the-first-time-an-entity-is-s.patch +++ b/Spigot-Server-Patches/0043-Send-absolute-position-the-first-time-an-entity-is-s.patch @@ -1,11 +1,11 @@ -From 00b4d0840ad4aa83fd9f668f114997cbf00e3105 Mon Sep 17 00:00:00 2001 +From dd5f739fe833b8a215e3f8822c57eecfd89cd661 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Wed, 2 Mar 2016 23:13:07 -0600 Subject: [PATCH] Send absolute position the first time an entity is seen diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index d864c774..4c6eb6ed 100644 +index d864c7745..4c6eb6ed1 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -41,7 +41,12 @@ public class EntityTrackerEntry { @@ -76,5 +76,5 @@ index d864c774..4c6eb6ed 100644 entityplayer.playerConnection.sendPacket(packet); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0041-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0044-Add-BeaconEffectEvent.patch similarity index 96% rename from Spigot-Server-Patches/0041-Add-BeaconEffectEvent.patch rename to Spigot-Server-Patches/0044-Add-BeaconEffectEvent.patch index 9d9fa64bd3..163092974d 100644 --- a/Spigot-Server-Patches/0041-Add-BeaconEffectEvent.patch +++ b/Spigot-Server-Patches/0044-Add-BeaconEffectEvent.patch @@ -1,11 +1,11 @@ -From f4d8d65c9697b298b90b1eb269ff0e2ab86698ac Mon Sep 17 00:00:00 2001 +From e77bc538984bbbf0e7f687632a51243419f2e808 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 23:30:53 -0600 Subject: [PATCH] Add BeaconEffectEvent diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java -index b84a2ce5..a57b1717 100644 +index b84a2ce55..a57b17171 100644 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java @@ -16,6 +16,14 @@ import org.bukkit.entity.HumanEntity; @@ -69,5 +69,5 @@ index b84a2ce5..a57b1717 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0045-Configurable-container-update-tick-rate.patch similarity index 96% rename from Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch rename to Spigot-Server-Patches/0045-Configurable-container-update-tick-rate.patch index fafd985282..a28ba14bbd 100644 --- a/Spigot-Server-Patches/0042-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0045-Configurable-container-update-tick-rate.patch @@ -1,4 +1,4 @@ -From 077ede472069273293c0cc7ddbc3416b7888849b Mon Sep 17 00:00:00 2001 +From de658229f19d33a91965d3552a3d3e2df61fdef6 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 23:34:44 -0600 Subject: [PATCH] Configurable container update tick rate @@ -45,5 +45,5 @@ index 3058dfef0..ed3546ccc 100644 this.closeInventory(); this.activeContainer = this.defaultContainer; -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0043-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0046-Use-UserCache-for-player-heads.patch similarity index 95% rename from Spigot-Server-Patches/0043-Use-UserCache-for-player-heads.patch rename to Spigot-Server-Patches/0046-Use-UserCache-for-player-heads.patch index 7e0638d88a..b3cc29e17f 100644 --- a/Spigot-Server-Patches/0043-Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/0046-Use-UserCache-for-player-heads.patch @@ -1,4 +1,4 @@ -From ac252f794e6d93e8120a97a015c25fde2f7200f9 Mon Sep 17 00:00:00 2001 +From 42a3ad24ded6b1cb5d7be1be315fe6cf89f7c0e1 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 2 Mar 2016 23:42:37 -0600 Subject: [PATCH] Use UserCache for player heads @@ -32,5 +32,5 @@ index b6b34627a..862b30286 100644 return true; -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0044-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0047-Disable-spigot-tick-limiters.patch similarity index 95% rename from Spigot-Server-Patches/0044-Disable-spigot-tick-limiters.patch rename to Spigot-Server-Patches/0047-Disable-spigot-tick-limiters.patch index fdf41456c9..232834b852 100644 --- a/Spigot-Server-Patches/0044-Disable-spigot-tick-limiters.patch +++ b/Spigot-Server-Patches/0047-Disable-spigot-tick-limiters.patch @@ -1,11 +1,11 @@ -From 22338f0f3207a00a9f48c20b9f394d118110981e Mon Sep 17 00:00:00 2001 +From a38a03bec72f44ef894d94609741021909ce1d11 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 23:45:17 -0600 Subject: [PATCH] Disable spigot tick limiters diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index fc7315f7..e85ed2e3 100644 +index fc7315f7d..e85ed2e33 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1426,10 +1426,10 @@ public abstract class World implements IBlockAccess { @@ -35,5 +35,5 @@ index fc7315f7..e85ed2e3 100644 TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition); // Spigot start -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0045-Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/0048-Configurable-Chunk-IO-Thread-Base-Count.patch similarity index 93% rename from Spigot-Server-Patches/0045-Configurable-Chunk-IO-Thread-Base-Count.patch rename to Spigot-Server-Patches/0048-Configurable-Chunk-IO-Thread-Base-Count.patch index 9b141ee859..7a2f1d96ed 100644 --- a/Spigot-Server-Patches/0045-Configurable-Chunk-IO-Thread-Base-Count.patch +++ b/Spigot-Server-Patches/0048-Configurable-Chunk-IO-Thread-Base-Count.patch @@ -1,11 +1,11 @@ -From b4c98eb4f723e9e65cb7e4dbc88325fd72813d34 Mon Sep 17 00:00:00 2001 +From 128af90387c06be0da343f45b342a235228b37ea Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 23:46:57 -0600 Subject: [PATCH] Configurable Chunk IO Thread Base Count diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index b5795b6d..36689db7 100644 +index b5795b6d3..36689db74 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -199,4 +199,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ index b5795b6d..36689db7 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java -index e4fd9bc6..7b7a3d01 100644 +index e4fd9bc60..7b7a3d01b 100644 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java @@ -1,5 +1,6 @@ @@ -39,5 +39,5 @@ index e4fd9bc6..7b7a3d01 100644 private static final AsynchronousExecutor instance = new AsynchronousExecutor(new ChunkIOProvider(), BASE_THREADS); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0046-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch similarity index 94% rename from Spigot-Server-Patches/0046-Add-PlayerInitialSpawnEvent.patch rename to Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch index 41305e2e30..c992024641 100644 --- a/Spigot-Server-Patches/0046-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-Server-Patches/0049-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From 40abd729cda512166ac068a2593b32a45205cbe8 Mon Sep 17 00:00:00 2001 +From a696a1afb907dcc000b57e966c3ab11c5aa53138 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Thu, 3 Mar 2016 00:09:38 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent For modifying a player's initial spawn location as they join the server diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 784d6b62..b38ff689 100644 +index 1d9f3e3dd..536534d2e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -110,6 +110,21 @@ public abstract class PlayerList { @@ -32,5 +32,5 @@ index 784d6b62..b38ff689 100644 entityplayer.playerInteractManager.a((WorldServer) entityplayer.world); String s1 = "local"; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0047-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0050-Disable-chest-cat-detection.patch similarity index 96% rename from Spigot-Server-Patches/0047-Disable-chest-cat-detection.patch rename to Spigot-Server-Patches/0050-Disable-chest-cat-detection.patch index e1f29dc47b..513aa782ad 100644 --- a/Spigot-Server-Patches/0047-Disable-chest-cat-detection.patch +++ b/Spigot-Server-Patches/0050-Disable-chest-cat-detection.patch @@ -1,4 +1,4 @@ -From 8a0d7626b94d1a66dca31152c8e73d5629babbbe Mon Sep 17 00:00:00 2001 +From e86c5102d5b832a152202db0b357323fc3755fce Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:13:45 -0600 Subject: [PATCH] Disable chest cat detection @@ -35,5 +35,5 @@ index da2cfe206..bc398ec52 100644 EntityOcelot entityocelot; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0048-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch similarity index 98% rename from Spigot-Server-Patches/0048-Ensure-commands-are-not-ran-async.patch rename to Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch index b5648ef76c..5fcda5b7a7 100644 --- a/Spigot-Server-Patches/0048-Ensure-commands-are-not-ran-async.patch +++ b/Spigot-Server-Patches/0051-Ensure-commands-are-not-ran-async.patch @@ -1,4 +1,4 @@ -From 09e8ebb6054e3f37de7d78ab784147cbf62985d4 Mon Sep 17 00:00:00 2001 +From c7b0d45e95bb420f3051f4bde3d28fc8d584a03a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:17:12 -0600 Subject: [PATCH] Ensure commands are not ran async @@ -118,5 +118,5 @@ index 49768734d..947c43a5d 100644 { if ( script.isFile() ) -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0049-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0052-All-chunks-are-slime-spawn-chunks-toggle.patch similarity index 96% rename from Spigot-Server-Patches/0049-All-chunks-are-slime-spawn-chunks-toggle.patch rename to Spigot-Server-Patches/0052-All-chunks-are-slime-spawn-chunks-toggle.patch index 700829822c..4aa44b9e50 100644 --- a/Spigot-Server-Patches/0049-All-chunks-are-slime-spawn-chunks-toggle.patch +++ b/Spigot-Server-Patches/0052-All-chunks-are-slime-spawn-chunks-toggle.patch @@ -1,4 +1,4 @@ -From 79dbad715acc2a9afa9b55b2cfacdf7520d48080 Mon Sep 17 00:00:00 2001 +From 0b776c2a991e7b2afc49d7dd72d8d44a55574465 Mon Sep 17 00:00:00 2001 From: vemacs Date: Thu, 3 Mar 2016 01:19:22 -0600 Subject: [PATCH] All chunks are slime spawn chunks toggle @@ -34,5 +34,5 @@ index 272b22652..3d3a9ca04 100644 } } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0050-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0053-Optimize-Pathfinding.patch similarity index 94% rename from Spigot-Server-Patches/0050-Optimize-Pathfinding.patch rename to Spigot-Server-Patches/0053-Optimize-Pathfinding.patch index e89120c837..9795a605af 100644 --- a/Spigot-Server-Patches/0050-Optimize-Pathfinding.patch +++ b/Spigot-Server-Patches/0053-Optimize-Pathfinding.patch @@ -1,4 +1,4 @@ -From d07a9f35fa53a4f2cd7c20d38e15e74f90347e7b Mon Sep 17 00:00:00 2001 +From a1991aa9db5af320aa989bf9cfc44ddda11f8001 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:02:07 -0600 Subject: [PATCH] Optimize Pathfinding @@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as arrow attacks. diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index bfc5769f..cc44d30b 100644 +index bfc5769f7..cc44d30b5 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -118,10 +118,26 @@ public abstract class NavigationAbstract { @@ -47,5 +47,5 @@ index bfc5769f..cc44d30b 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0051-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0054-Avoid-hopper-searches-if-there-are-no-items.patch similarity index 92% rename from Spigot-Server-Patches/0051-Avoid-hopper-searches-if-there-are-no-items.patch rename to Spigot-Server-Patches/0054-Avoid-hopper-searches-if-there-are-no-items.patch index 6b8a159b79..4e79988fa1 100644 --- a/Spigot-Server-Patches/0051-Avoid-hopper-searches-if-there-are-no-items.patch +++ b/Spigot-Server-Patches/0054-Avoid-hopper-searches-if-there-are-no-items.patch @@ -1,4 +1,4 @@ -From 87454f7aa992d28fb8dac2b75804360f77293510 Mon Sep 17 00:00:00 2001 +From 04eb0a217ec431985499b59ceb505a2047a3173c Mon Sep 17 00:00:00 2001 From: CullanP Date: Thu, 3 Mar 2016 02:13:38 -0600 Subject: [PATCH] Avoid hopper searches if there are no items @@ -14,10 +14,10 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear Combined, this adds up a lot. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index c1f25e8d..2a1c11a0 100644 +index aaf253c89..a5db14343 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -47,6 +47,13 @@ public class Chunk { +@@ -76,6 +76,13 @@ public class Chunk { public boolean d; protected gnu.trove.map.hash.TObjectIntHashMap entityCount = new gnu.trove.map.hash.TObjectIntHashMap(); // Spigot @@ -31,7 +31,7 @@ index c1f25e8d..2a1c11a0 100644 // CraftBukkit start - Neighbor loaded cache for chunk lighting and entity ticking private int neighbors = 0x1 << 12; public long chunkKey; -@@ -619,6 +626,13 @@ public class Chunk { +@@ -648,6 +655,13 @@ public class Chunk { entity.ac = k; entity.ad = this.locZ; this.entitySlices[k].add(entity); @@ -45,7 +45,7 @@ index c1f25e8d..2a1c11a0 100644 // Spigot start - increment creature type count // Keep this synced up with World.a(Class) if (entity instanceof EntityInsentient) { -@@ -651,6 +665,13 @@ public class Chunk { +@@ -684,6 +698,13 @@ public class Chunk { } this.entitySlices[i].remove(entity); @@ -59,7 +59,7 @@ index c1f25e8d..2a1c11a0 100644 // Spigot start - decrement creature type count // Keep this synced up with World.a(Class) if (entity instanceof EntityInsentient) { -@@ -842,6 +863,15 @@ public class Chunk { +@@ -879,6 +900,15 @@ public class Chunk { if (!this.entitySlices[k].isEmpty()) { Iterator iterator = this.entitySlices[k].iterator(); @@ -75,7 +75,7 @@ index c1f25e8d..2a1c11a0 100644 while (iterator.hasNext()) { Entity entity1 = (Entity) iterator.next(); -@@ -878,7 +908,18 @@ public class Chunk { +@@ -915,7 +945,18 @@ public class Chunk { i = MathHelper.clamp(i, 0, this.entitySlices.length - 1); j = MathHelper.clamp(j, 0, this.entitySlices.length - 1); @@ -95,5 +95,5 @@ index c1f25e8d..2a1c11a0 100644 while (iterator.hasNext()) { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0052-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch similarity index 84% rename from Spigot-Server-Patches/0052-Expose-server-CommandMap.patch rename to Spigot-Server-Patches/0055-Expose-server-CommandMap.patch index ce4fa8fafc..714416a72b 100644 --- a/Spigot-Server-Patches/0052-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0055-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From d587d2dde23a2f8567a1cceecd11261c36060b27 Mon Sep 17 00:00:00 2001 +From 185ae1f1fd5dda3d640dc46dd02cda578dac0f10 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:15:57 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 082957d3..8bec4993 100644 +index 462ad1024..1386bed52 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1564,6 +1564,7 @@ public final class CraftServer implements Server { @@ -17,5 +17,5 @@ index 082957d3..8bec4993 100644 return commandMap; } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0056-Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 92% rename from Spigot-Server-Patches/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch rename to Spigot-Server-Patches/0056-Be-a-bit-more-informative-in-maxHealth-exception.patch index 190155ec80..57fd0ce95a 100644 --- a/Spigot-Server-Patches/0053-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/Spigot-Server-Patches/0056-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -1,11 +1,11 @@ -From e0cd0d92c3a5385e827cc313cef320ac0594bf41 Mon Sep 17 00:00:00 2001 +From 5a0ca0019bba86347b69d398a66bf641dfcda650 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:18:39 -0600 Subject: [PATCH] Be a bit more informative in maxHealth exception diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 425919cd..7bf45f7d 100644 +index bf4428e1c..34f1ef176 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -94,7 +94,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -21,5 +21,5 @@ index 425919cd..7bf45f7d 100644 getHandle().setHealth((float) health); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0054-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch similarity index 99% rename from Spigot-Server-Patches/0054-Player-Tab-List-and-Title-APIs.patch rename to Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch index d12e0e04e0..2112620fe3 100644 --- a/Spigot-Server-Patches/0054-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0057-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From c20bec68afa5809d1f05b6bd56a97da0b5511fa4 Mon Sep 17 00:00:00 2001 +From abeaa2a2bfcde56cb470cdbcc36d5eaac6e02320 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 02:32:10 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -175,5 +175,5 @@ index b2b707305..c14100ac6 100644 public String getDisplayName() { return getHandle().displayName; -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0055-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch similarity index 89% rename from Spigot-Server-Patches/0055-Ensure-inv-drag-is-in-bounds.patch rename to Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch index ccfb0a812d..a98c520b7b 100644 --- a/Spigot-Server-Patches/0055-Ensure-inv-drag-is-in-bounds.patch +++ b/Spigot-Server-Patches/0058-Ensure-inv-drag-is-in-bounds.patch @@ -1,11 +1,11 @@ -From 5394e873fbcf4dd43535cdaa0d98fcf3ce02114d Mon Sep 17 00:00:00 2001 +From c366a9167ac26fc0eb4230e64b012b3dfbbcc2de Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:33:53 -0600 Subject: [PATCH] Ensure inv drag is in bounds diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java -index 7d80b68b..3a488ce2 100644 +index 7d80b68b2..3a488ce20 100644 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -141,7 +141,7 @@ public abstract class Container { @@ -18,5 +18,5 @@ index 7d80b68b..3a488ce2 100644 itemstack1 = playerinventory.getCarried(); if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0056-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch similarity index 95% rename from Spigot-Server-Patches/0056-Change-implementation-of-tile-entity-removal-list.patch rename to Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch index be66275942..a6ecfb3a4c 100644 --- a/Spigot-Server-Patches/0056-Change-implementation-of-tile-entity-removal-list.patch +++ b/Spigot-Server-Patches/0059-Change-implementation-of-tile-entity-removal-list.patch @@ -1,14 +1,14 @@ -From 91da56f560ed2baf64ec8fb3530b7329b5865325 Mon Sep 17 00:00:00 2001 +From bc94a21d1941e2d5d173d0be455acef7c1b02ce8 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:39:54 -0600 Subject: [PATCH] Change implementation of (tile)entity removal list diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9ee8c40a..438624dd 100644 +index aadc426fd..584501787 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -122,7 +122,7 @@ public abstract class Entity implements ICommandListener { +@@ -122,7 +122,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper private static final DataWatcherObject aC = DataWatcher.a(Entity.class, DataWatcherRegistry.h); private static final DataWatcherObject aD = DataWatcher.a(Entity.class, DataWatcherRegistry.h); private static final DataWatcherObject aE = DataWatcher.a(Entity.class, DataWatcherRegistry.h); @@ -18,7 +18,7 @@ index 9ee8c40a..438624dd 100644 public int ac; public int getChunkY() { return ac; } // Paper - OBFHELPER public int ad; public int getChunkZ() { return ad; } // Paper - OBFHELPER diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e85ed2e3..89197281 100644 +index e85ed2e33..89197281e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -31,6 +31,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; @@ -78,5 +78,5 @@ index e85ed2e3..89197281 100644 this.f.clear(); this.l(); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0057-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch similarity index 97% rename from Spigot-Server-Patches/0057-Add-configurable-portal-search-radius.patch rename to Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch index be24ac434f..724c835c8a 100644 --- a/Spigot-Server-Patches/0057-Add-configurable-portal-search-radius.patch +++ b/Spigot-Server-Patches/0060-Add-configurable-portal-search-radius.patch @@ -1,4 +1,4 @@ -From 3dc4aded0ca26267f9b737e34272a10cb89045de Mon Sep 17 00:00:00 2001 +From 0b318cc00f265124445ca5f9f0f833525e066ca9 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:46:17 -0600 Subject: [PATCH] Add configurable portal search radius @@ -54,5 +54,5 @@ index 1d5dce10e..7ca2617a8 100644 private boolean canCreatePortal = true; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0058-Add-velocity-warnings.patch b/Spigot-Server-Patches/0061-Add-velocity-warnings.patch similarity index 95% rename from Spigot-Server-Patches/0058-Add-velocity-warnings.patch rename to Spigot-Server-Patches/0061-Add-velocity-warnings.patch index a49ae2c951..ad09668fbe 100644 --- a/Spigot-Server-Patches/0058-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0061-Add-velocity-warnings.patch @@ -1,11 +1,11 @@ -From 5d7034040c0b6785bd57f42da9d93af845990760 Mon Sep 17 00:00:00 2001 +From fb23b7590e446635c8435469d8a3f8aaa49234c0 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:48:12 -0600 Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8bec4993..16b8d38a 100644 +index 1386bed52..d56966109 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -173,6 +173,7 @@ public final class CraftServer implements Server { @@ -17,10 +17,10 @@ index 8bec4993..16b8d38a 100644 private final class BooleanWrapper { private boolean value = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 0f38abaf..8628cd5a 100644 +index 6c23e88a5..3b25b8b73 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -240,12 +240,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -247,12 +247,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public void setVelocity(Vector velocity) { Preconditions.checkArgument(velocity != null, "velocity"); velocity.checkFinite(); @@ -66,7 +66,7 @@ index 0f38abaf..8628cd5a 100644 public double getHeight() { return getHandle().length; diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 3ed983cc..6384d50e 100644 +index 91b8aa6a1..0c106ea9c 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -66,7 +66,19 @@ public class WatchdogThread extends Thread @@ -91,5 +91,5 @@ index 3ed983cc..6384d50e 100644 log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log ); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0059-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0062-Configurable-inter-world-teleportation-safety.patch similarity index 98% rename from Spigot-Server-Patches/0059-Configurable-inter-world-teleportation-safety.patch rename to Spigot-Server-Patches/0062-Configurable-inter-world-teleportation-safety.patch index 5ae94f26a2..05617152c1 100644 --- a/Spigot-Server-Patches/0059-Configurable-inter-world-teleportation-safety.patch +++ b/Spigot-Server-Patches/0062-Configurable-inter-world-teleportation-safety.patch @@ -1,4 +1,4 @@ -From 52a843bdcf3007d3a162688c19e81226dd77bf9e Mon Sep 17 00:00:00 2001 +From a1057f8d4cd02724b07e348e56022b1892e0cb40 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Configurable inter-world teleportation safety @@ -57,5 +57,5 @@ index c14100ac6..6a43f5674 100644 return true; } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0060-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch similarity index 99% rename from Spigot-Server-Patches/0060-Add-exception-reporting-event.patch rename to Spigot-Server-Patches/0063-Add-exception-reporting-event.patch index e723c6c073..d82dfd5392 100644 --- a/Spigot-Server-Patches/0060-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0063-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 82d307e6cab4ac0ca3171b430e5eecd61cd27787 Mon Sep 17 00:00:00 2001 +From fa5787eee0ee62491653acc9fd911e0e3f9134c0 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event @@ -50,7 +50,7 @@ index 000000000..93397188b +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 2a1c11a04..cc4a9dbe6 100644 +index a5db14343..0788f7712 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1,5 +1,6 @@ @@ -68,7 +68,7 @@ index 2a1c11a04..cc4a9dbe6 100644 public class Chunk { -@@ -758,10 +760,15 @@ public class Chunk { +@@ -795,10 +797,15 @@ public class Chunk { this.tileEntities.remove(blockposition); // Paper end } else { @@ -375,5 +375,5 @@ index 93b9134d6..26753fac5 100644 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch similarity index 93% rename from Spigot-Server-Patches/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch rename to Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch index 1e90643fef..738b588392 100644 --- a/Spigot-Server-Patches/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch +++ b/Spigot-Server-Patches/0064-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch @@ -1,4 +1,4 @@ -From acf1d6b999ead0cb9dfb022031296a0e803c6fc2 Mon Sep 17 00:00:00 2001 +From 19fe04ed766ce08de277106c28f66e864ac03f29 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 18:28:43 -0800 Subject: [PATCH] Don't nest if we don't need to when cerealising text @@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java -index 67666d35..5d1a4962 100644 +index 67666d35b..5d1a49623 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java @@ -27,7 +27,14 @@ public class PacketPlayOutChat implements Packet { @@ -26,5 +26,5 @@ index 67666d35..5d1a4962 100644 packetdataserializer.a(this.a); } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0062-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch similarity index 92% rename from Spigot-Server-Patches/0062-Disable-Scoreboards-for-non-players-by-default.patch rename to Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch index f06f137da4..97c68c43d2 100644 --- a/Spigot-Server-Patches/0062-Disable-Scoreboards-for-non-players-by-default.patch +++ b/Spigot-Server-Patches/0065-Disable-Scoreboards-for-non-players-by-default.patch @@ -1,4 +1,4 @@ -From cf2004f2b659ca6d14b06d1c5c5e79b16cbb0ac7 Mon Sep 17 00:00:00 2001 +From b66a86a51ef63edaa49df63bb3cee22e5822e1bb Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 8 Mar 2016 23:25:45 -0500 Subject: [PATCH] Disable Scoreboards for non players by default @@ -37,10 +37,10 @@ index ec9a87239..b08274d93 100644 if (scoreboard.addPlayerToTeam(s2, s)) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 8ca7324e9..293ac271d 100644 +index 584501787..b4ad611fc 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2079,6 +2079,7 @@ public abstract class Entity implements ICommandListener { +@@ -2098,6 +2098,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper @Nullable public ScoreboardTeamBase aY() { @@ -49,5 +49,5 @@ index 8ca7324e9..293ac271d 100644 } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 89% rename from Spigot-Server-Patches/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 188df9b944..c7ed817cd5 100644 --- a/Spigot-Server-Patches/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,11 +1,11 @@ -From 1327edcaa7361519198876a7e6659f8109fe97ae Mon Sep 17 00:00:00 2001 +From 076a022c505a512a8d517c8b7234686dccc4577b Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 7bf45f7d..b9e10603 100644 +index 34f1ef176..d4d51688c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -494,4 +494,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -26,5 +26,5 @@ index 7bf45f7d..b9e10603 100644 + // Paper end } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0064-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch similarity index 97% rename from Spigot-Server-Patches/0064-Complete-resource-pack-API.patch rename to Spigot-Server-Patches/0067-Complete-resource-pack-API.patch index 12509bf06b..3ab2e54026 100644 --- a/Spigot-Server-Patches/0064-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0067-Complete-resource-pack-API.patch @@ -1,11 +1,11 @@ -From d883cb3dd2a94346d63fa82bbacba5e83c39a208 Mon Sep 17 00:00:00 2001 +From ddec55539acaec545c955faeb164804d81f528d6 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 23:17:52 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5348c0cbc..5cc5dbcd7 100644 +index 48379f414..e1b85ebae 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1067,7 +1067,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -71,5 +71,5 @@ index 6a43f5674..45b11d87c 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0065-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch similarity index 97% rename from Spigot-Server-Patches/0065-Chunk-save-queue-improvements.patch rename to Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch index b1a311e78c..8db9845612 100644 --- a/Spigot-Server-Patches/0065-Chunk-save-queue-improvements.patch +++ b/Spigot-Server-Patches/0068-Chunk-save-queue-improvements.patch @@ -1,4 +1,4 @@ -From 7f29042fa8a19c844fee61cfe0271a47e28e204c Mon Sep 17 00:00:00 2001 +From c137628da7ca3cdca8ef577cdb3594bff5460657 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 4 Mar 2016 18:18:37 -0600 Subject: [PATCH] Chunk save queue improvements @@ -26,7 +26,7 @@ Then finally, Sleeping will by default be removed, but due to known issues with But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 36689db7..3898ad8f 100644 +index 36689db74..3898ad8fa 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -204,4 +204,10 @@ public class PaperConfig { @@ -41,7 +41,7 @@ index 36689db7..3898ad8f 100644 + } } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index a401dec6..4c3faa20 100644 +index a401dec60..4c3faa201 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -12,6 +12,7 @@ import java.util.List; @@ -138,7 +138,7 @@ index a401dec6..4c3faa20 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java -index 1d6b1874..9ee4115b 100644 +index 1d6b1874c..9ee4115be 100644 --- a/src/main/java/net/minecraft/server/FileIOThread.java +++ b/src/main/java/net/minecraft/server/FileIOThread.java @@ -39,11 +39,15 @@ public class FileIOThread implements Runnable { @@ -162,5 +162,5 @@ index 1d6b1874..9ee4115b 100644 if (this.b.isEmpty()) { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0066-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch similarity index 94% rename from Spigot-Server-Patches/0066-Chunk-Save-Reattempt.patch rename to Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch index 5cc0d03615..e024da8af3 100644 --- a/Spigot-Server-Patches/0066-Chunk-Save-Reattempt.patch +++ b/Spigot-Server-Patches/0069-Chunk-Save-Reattempt.patch @@ -1,4 +1,4 @@ -From 8aa4fd3f27fff342a97065ddfbe6c143ccf91f55 Mon Sep 17 00:00:00 2001 +From bc3a702f71fbd98ac83d02992c8df88a9207e765 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Mar 2013 23:46:10 -0500 Subject: [PATCH] Chunk Save Reattempt @@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks. diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 4c3faa20..12bd558a 100644 +index 4c3faa201..12bd558a7 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -194,11 +194,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -28,7 +28,7 @@ index 4c3faa20..12bd558a 100644 synchronized (lock) { if (this.b.get(chunkcoordintpair) == chunk.compoundSupplier) { this.b.remove(chunkcoordintpair); } }// Paper - This will not equal if a newer version is still pending diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 6a92b5af..5bcbd718 100644 +index 6a92b5af8..5bcbd718f 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -210,8 +210,7 @@ public class RegionFile { @@ -42,5 +42,5 @@ index 6a92b5af..5bcbd718 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0067-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch similarity index 95% rename from Spigot-Server-Patches/0067-Default-loading-permissions.yml-before-plugins.patch rename to Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch index c8bfbcd065..f78e17e835 100644 --- a/Spigot-Server-Patches/0067-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0070-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From 59a7aa4ed75ec50385be412519acc32e79b5923b Mon Sep 17 00:00:00 2001 +From 2003df4e8bd6827060840d6c24d45b9cca953384 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:17:38 -0400 Subject: [PATCH] Default loading permissions.yml before plugins @@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe A config option has been added for those who depend on the previous behavior, but I don't expect that. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 3898ad8f..2f6e169f 100644 +index 3898ad8fa..2f6e169f5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -210,4 +210,9 @@ public class PaperConfig { @@ -30,7 +30,7 @@ index 3898ad8f..2f6e169f 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 16b8d38a..9e50bc49 100644 +index d56966109..d482589b3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -322,6 +322,7 @@ public final class CraftServer implements Server { @@ -51,5 +51,5 @@ index 16b8d38a..9e50bc49 100644 CraftDefaultPermissions.registerCorePermissions(); helpMap.initializeCommands(); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0068-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch similarity index 92% rename from Spigot-Server-Patches/0068-Allow-Reloading-of-Custom-Permissions.patch rename to Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch index 11fd8b48fc..760bdd39f6 100644 --- a/Spigot-Server-Patches/0068-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0071-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From dd903cb350bb0f8ed52213d417523ca1de2527cb Mon Sep 17 00:00:00 2001 +From 80b97310030500c8eae0b1d7b8c4ba337b5fa17b Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:30:17 -0400 Subject: [PATCH] Allow Reloading of Custom Permissions @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9e50bc49..fd4e0279 100644 +index d482589b3..e53f8c58f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1863,5 +1863,20 @@ public final class CraftServer implements Server { @@ -31,5 +31,5 @@ index 9e50bc49..fd4e0279 100644 // Paper end } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0069-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch similarity index 91% rename from Spigot-Server-Patches/0069-Remove-Metadata-on-reload.patch rename to Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch index 2410867a42..5cb0d34025 100644 --- a/Spigot-Server-Patches/0069-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0072-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From 3c10de727781081009381cdd8eaebac04040ceff Mon Sep 17 00:00:00 2001 +From 3481b79ff64f24f29029cafe3367f2bcfee00e3c Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:50:14 -0400 Subject: [PATCH] Remove Metadata on reload @@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index fd4e0279..5d15d584 100644 +index e53f8c58f..d3e949707 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -743,8 +743,18 @@ public final class CraftServer implements Server { @@ -30,5 +30,5 @@ index fd4e0279..5d15d584 100644 reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0070-Undead-horse-leashing.patch b/Spigot-Server-Patches/0073-Undead-horse-leashing.patch similarity index 95% rename from Spigot-Server-Patches/0070-Undead-horse-leashing.patch rename to Spigot-Server-Patches/0073-Undead-horse-leashing.patch index ce2f6a0bf4..337940ae05 100644 --- a/Spigot-Server-Patches/0070-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0073-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From 6da4750f26b7861285d45bfe2a164780f32dcab5 Mon Sep 17 00:00:00 2001 +From fc16de493fda64fc50353d88616f97947e2f4053 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing @@ -33,5 +33,5 @@ index 46d1ea217..dcc39236f 100644 protected void q(float f) { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0071-Fix-Furnace-cook-time-bug.patch b/Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch similarity index 91% rename from Spigot-Server-Patches/0071-Fix-Furnace-cook-time-bug.patch rename to Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch index 00d789fdec..5283a07cab 100644 --- a/Spigot-Server-Patches/0071-Fix-Furnace-cook-time-bug.patch +++ b/Spigot-Server-Patches/0074-Fix-Furnace-cook-time-bug.patch @@ -1,4 +1,4 @@ -From c36013fd353a1f51ac3e51fae0054caf6d0bb405 Mon Sep 17 00:00:00 2001 +From cbd0700140ece892d3de977dc69b4b2e5c585291 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:24:53 -0400 Subject: [PATCH] Fix Furnace cook time bug @@ -9,7 +9,7 @@ cook in the expected amount of time as the cook time was not decremented correct This patch ensures that furnaces cook to the correct wall time expectation. diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 886a73e9..7a142810 100644 +index 886a73e93..7a1428105 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -165,7 +165,7 @@ public class TileEntityFurnace extends TileEntityContainer implements ITickable, @@ -22,5 +22,5 @@ index 886a73e9..7a142810 100644 this.burn(); flag1 = true; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0072-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch similarity index 99% rename from Spigot-Server-Patches/0072-Handle-Item-Meta-Inconsistencies.patch rename to Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch index e3871bae91..9586173a37 100644 --- a/Spigot-Server-Patches/0072-Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/0075-Handle-Item-Meta-Inconsistencies.patch @@ -1,4 +1,4 @@ -From cc98c3d6d2a78be363dccfc73b395cc82d52810d Mon Sep 17 00:00:00 2001 +From 841254f7471189b0be7020ad4f65eea1c697d2c1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies diff --git a/Spigot-Server-Patches/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 94% rename from Spigot-Server-Patches/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch index 19c4354a49..12621c91d8 100644 --- a/Spigot-Server-Patches/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 13b6f5ac556822bec0916f8ef59f0f4a5ad15713 Mon Sep 17 00:00:00 2001 +From 5086a12a999a530288262ae057cd49229bce127c Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 15:12:22 -0400 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate @@ -24,7 +24,7 @@ index faacd86ba..f71580393 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 3ff8b96f1..f55eb654b 100644 +index 584782adb..86836a5d0 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -157,7 +157,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -37,5 +37,5 @@ index 3ff8b96f1..f55eb654b 100644 } } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0074-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0077-Add-World-Util-Methods.patch similarity index 97% rename from Spigot-Server-Patches/0074-Add-World-Util-Methods.patch rename to Spigot-Server-Patches/0077-Add-World-Util-Methods.patch index 295ec04a37..d56acb9ef8 100644 --- a/Spigot-Server-Patches/0074-Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/0077-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From c86880704c90a04a4f7a660823757fea8f2a7f0c Mon Sep 17 00:00:00 2001 +From 9f9ec804809dd8bf00e6cbb2c633594403f24a29 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 20:16:03 -0400 Subject: [PATCH] Add World Util Methods @@ -6,10 +6,10 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index cc4a9dbe6..84a880561 100644 +index 0788f7712..57b23a018 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -581,6 +581,7 @@ public class Chunk { +@@ -610,6 +610,7 @@ public class Chunk { } @@ -119,5 +119,5 @@ index 6be9c1815..b8ae41704 100644 // CraftBukkit start - tree generation if (captureTreeGeneration) { -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0075-Optimized-Light-Level-Comparisons.patch b/Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch similarity index 96% rename from Spigot-Server-Patches/0075-Optimized-Light-Level-Comparisons.patch rename to Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch index 84c49f6ff6..435178437e 100644 --- a/Spigot-Server-Patches/0075-Optimized-Light-Level-Comparisons.patch +++ b/Spigot-Server-Patches/0078-Optimized-Light-Level-Comparisons.patch @@ -1,4 +1,4 @@ -From c2a48e1b1cab73dacad11ef4a38c1907bae4c4a8 Mon Sep 17 00:00:00 2001 +From 48a4571e79ab35c95bf6266573c1edcb1a07dfa0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 21:22:56 -0400 Subject: [PATCH] Optimized Light Level Comparisons @@ -8,7 +8,7 @@ Use an optimized method to test if a block position meets a desired light level. This method benefits from returning as soon as the desired light level matches. diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java -index c0b88580..55ed0c95 100644 +index c0b88580c..55ed0c956 100644 --- a/src/main/java/net/minecraft/server/BlockCrops.java +++ b/src/main/java/net/minecraft/server/BlockCrops.java @@ -48,7 +48,7 @@ public class BlockCrops extends BlockPlant implements IBlockFragilePlantElement @@ -21,7 +21,7 @@ index c0b88580..55ed0c95 100644 if (i < this.g()) { diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java -index fe55848b..8fc736d6 100644 +index fe55848be..8fc736d6a 100644 --- a/src/main/java/net/minecraft/server/BlockGrass.java +++ b/src/main/java/net/minecraft/server/BlockGrass.java @@ -29,7 +29,8 @@ public class BlockGrass extends Block implements IBlockFragilePlantElement { @@ -65,7 +65,7 @@ index fe55848b..8fc736d6 100644 // world.setTypeUpdate(blockposition1, Blocks.GRASS.getBlockData()); org.bukkit.World bworld = world.getWorld(); diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java -index 6d0f4c15..3bbb123b 100644 +index 6d0f4c156..3bbb123bc 100644 --- a/src/main/java/net/minecraft/server/BlockSapling.java +++ b/src/main/java/net/minecraft/server/BlockSapling.java @@ -34,7 +34,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen @@ -78,7 +78,7 @@ index 6d0f4c15..3bbb123b 100644 world.captureTreeGeneration = true; // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java -index f12987c8..5ae7bd9d 100644 +index f12987c84..5ae7bd9df 100644 --- a/src/main/java/net/minecraft/server/BlockStem.java +++ b/src/main/java/net/minecraft/server/BlockStem.java @@ -48,7 +48,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement { @@ -91,7 +91,7 @@ index f12987c8..5ae7bd9d 100644 if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java -index 0f55cf51..8782bce5 100644 +index 0f55cf515..8782bce56 100644 --- a/src/main/java/net/minecraft/server/EntityMonster.java +++ b/src/main/java/net/minecraft/server/EntityMonster.java @@ -118,17 +118,17 @@ public abstract class EntityMonster extends EntityCreature implements IMonster { @@ -118,7 +118,7 @@ index 0f55cf51..8782bce5 100644 } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 277f1414..6111ca0b 100644 +index 277f1414a..6111ca0b2 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -178,7 +178,7 @@ public class EntityZombie extends EntityMonster { @@ -131,5 +131,5 @@ index 277f1414..6111ca0b 100644 if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) { this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0076-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch similarity index 90% rename from Spigot-Server-Patches/0076-Pass-world-to-Village-creation.patch rename to Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch index 83971a01c7..d50015b9b8 100644 --- a/Spigot-Server-Patches/0076-Pass-world-to-Village-creation.patch +++ b/Spigot-Server-Patches/0079-Pass-world-to-Village-creation.patch @@ -1,4 +1,4 @@ -From 78ae8cc0f56bec8e4fa7d851fe63fb846d7b3ec7 Mon Sep 17 00:00:00 2001 +From dd7c164ead24c4f2b19d7d110e07ab96c037e83d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 19 Mar 2016 15:16:54 -0400 Subject: [PATCH] Pass world to Village creation @@ -6,7 +6,7 @@ Subject: [PATCH] Pass world to Village creation fixes NPE bug #95 diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java -index a5b79eca..01f7cee3 100644 +index a5b79ecad..01f7cee38 100644 --- a/src/main/java/net/minecraft/server/PersistentVillage.java +++ b/src/main/java/net/minecraft/server/PersistentVillage.java @@ -238,7 +238,7 @@ public class PersistentVillage extends PersistentBase { @@ -19,7 +19,7 @@ index a5b79eca..01f7cee3 100644 village.a(nbttagcompound1); this.villages.add(village); diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java -index fb52785b..2eb33a98 100644 +index fb52785b9..2eb33a986 100644 --- a/src/main/java/net/minecraft/server/Village.java +++ b/src/main/java/net/minecraft/server/Village.java @@ -24,7 +24,7 @@ public class Village { @@ -32,5 +32,5 @@ index fb52785b..2eb33a98 100644 this.d = BlockPosition.ZERO; this.j = Maps.newHashMap(); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0077-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch similarity index 96% rename from Spigot-Server-Patches/0077-Custom-replacement-for-eaten-items.patch rename to Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch index 85f74a3dcf..04bc9b376a 100644 --- a/Spigot-Server-Patches/0077-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0080-Custom-replacement-for-eaten-items.patch @@ -1,4 +1,4 @@ -From c0852484004f5469a55cf7b701da774014ff4b72 Mon Sep 17 00:00:00 2001 +From 6aca1eb30fa703436f9e195e2a3b17c38c223f15 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:07:20 -0400 Subject: [PATCH] Custom replacement for eaten items @@ -46,5 +46,5 @@ index 2aaeac324..7e2cc66d7 100644 } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 97% rename from Spigot-Server-Patches/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch index e50414facf..165aa897d9 100644 --- a/Spigot-Server-Patches/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0081-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,4 +1,4 @@ -From 73ac346074556ad06db864c7e3667a6b7f6fbb4f Mon Sep 17 00:00:00 2001 +From 558a45afb1073046cc7943652e9a7b4190d0fec7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data @@ -56,5 +56,5 @@ index 45b11d87c..aa7751059 100644 } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0079-Catch-Async-PlayerChunkMap-operations.patch b/Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch similarity index 89% rename from Spigot-Server-Patches/0079-Catch-Async-PlayerChunkMap-operations.patch rename to Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch index 7116792d8b..fce59c9c82 100644 --- a/Spigot-Server-Patches/0079-Catch-Async-PlayerChunkMap-operations.patch +++ b/Spigot-Server-Patches/0082-Catch-Async-PlayerChunkMap-operations.patch @@ -1,11 +1,11 @@ -From 42feef1fd45b5b935b0bbb322e3d3e48abc66249 Mon Sep 17 00:00:00 2001 +From c5c1acfc51996231112a7702df7839efa938e2fe Mon Sep 17 00:00:00 2001 From: Daniel Ennis Date: Sun, 20 Mar 2016 15:22:42 -0400 Subject: [PATCH] Catch Async PlayerChunkMap operations diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 9627a9be..ad1d90b5 100644 +index 9627a9be0..ad1d90b56 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -469,10 +469,12 @@ public class PlayerChunkMap { @@ -22,5 +22,5 @@ index 9627a9be..ad1d90b5 100644 long i = d(chunkcoordintpair.x, chunkcoordintpair.z); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0080-Support-offline-mode-in-whitelist-command-as-well.patch b/Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch similarity index 97% rename from Spigot-Server-Patches/0080-Support-offline-mode-in-whitelist-command-as-well.patch rename to Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch index ff1e3c2bb9..e388517ee7 100644 --- a/Spigot-Server-Patches/0080-Support-offline-mode-in-whitelist-command-as-well.patch +++ b/Spigot-Server-Patches/0083-Support-offline-mode-in-whitelist-command-as-well.patch @@ -1,11 +1,11 @@ -From 9915d4088a02b715b36eda4b090a09fbb55abca3 Mon Sep 17 00:00:00 2001 +From 0e1114be5240770f53eb77187b73f603f8f168cb Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 21 Mar 2016 00:19:18 -0500 Subject: [PATCH] Support offline mode in whitelist command as well diff --git a/src/main/java/net/minecraft/server/CommandWhitelist.java b/src/main/java/net/minecraft/server/CommandWhitelist.java -index c74d1d2b..0f4237db 100644 +index c74d1d2be..0f4237db1 100644 --- a/src/main/java/net/minecraft/server/CommandWhitelist.java +++ b/src/main/java/net/minecraft/server/CommandWhitelist.java @@ -44,24 +44,35 @@ public class CommandWhitelist extends CommandAbstract { @@ -89,5 +89,5 @@ index c74d1d2b..0f4237db 100644 + // Paper end } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0081-Waving-banner-workaround.patch b/Spigot-Server-Patches/0084-Waving-banner-workaround.patch similarity index 92% rename from Spigot-Server-Patches/0081-Waving-banner-workaround.patch rename to Spigot-Server-Patches/0084-Waving-banner-workaround.patch index b6154b770e..d43f7b840c 100644 --- a/Spigot-Server-Patches/0081-Waving-banner-workaround.patch +++ b/Spigot-Server-Patches/0084-Waving-banner-workaround.patch @@ -1,4 +1,4 @@ -From 663e46ea293a61a6023798fb9af8cd00b646f086 Mon Sep 17 00:00:00 2001 +From b0ea83e0b72ee47162d2950eb74ac94b5faede08 Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 19 Mar 2016 22:25:11 +0100 Subject: [PATCH] Waving banner workaround @@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround This patch is a workaround for MC-63720 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -index c5c3f40c..6413f76e 100644 +index c5c3f40ce..6413f76e7 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java @@ -4,7 +4,13 @@ import java.io.IOException; @@ -34,5 +34,5 @@ index c5c3f40c..6413f76e 100644 public void a(PacketDataSerializer packetdataserializer) throws IOException { -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0082-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0085-Use-a-Shared-Random-for-Entities.patch similarity index 87% rename from Spigot-Server-Patches/0082-Use-a-Shared-Random-for-Entities.patch rename to Spigot-Server-Patches/0085-Use-a-Shared-Random-for-Entities.patch index f18ae7be73..3979ac1497 100644 --- a/Spigot-Server-Patches/0082-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0085-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From 4e97c2e91c2a77de52a2dcdd5cfe5fd4185d835b Mon Sep 17 00:00:00 2001 +From 95dfc2d6b2593ea2603bc30932824b855b8bb672 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:33:47 -0400 Subject: [PATCH] Use a Shared Random for Entities @@ -6,10 +6,10 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9a1cac84..05d764fa 100644 +index b4ad611fc..4a08db5ba 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -46,6 +46,7 @@ public abstract class Entity implements ICommandListener { +@@ -46,6 +46,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper // CraftBukkit start private static final int CURRENT_LEVEL = 2; @@ -17,7 +17,7 @@ index 9a1cac84..05d764fa 100644 static boolean isLevelAtLeast(NBTTagCompound tag, int level) { return tag.hasKey("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level; } -@@ -171,7 +172,7 @@ public abstract class Entity implements ICommandListener { +@@ -171,7 +172,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper this.length = 1.8F; this.ax = 1; this.ay = 1.0F; @@ -27,5 +27,5 @@ index 9a1cac84..05d764fa 100644 this.justCreated = true; this.uniqueID = MathHelper.a(this.random); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0086-Don-t-teleport-dead-entities.patch similarity index 79% rename from Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch rename to Spigot-Server-Patches/0086-Don-t-teleport-dead-entities.patch index ec4d0387fd..43d88eae5b 100644 --- a/Spigot-Server-Patches/0083-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0086-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From ce02c4c108a6e9e282badb7ff325afa7f67e3d80 Mon Sep 17 00:00:00 2001 +From 6e950d7d4b2c87219dfecf46db8af308e8679023 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:55:23 -0400 Subject: [PATCH] Don't teleport dead entities @@ -7,10 +7,10 @@ Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 776e931c1..e1e918b21 100644 +index 4a08db5ba..d4ab5fba9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2355,7 +2355,7 @@ public abstract class Entity implements ICommandListener { +@@ -2374,7 +2374,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } public Entity teleportTo(Location exit, boolean portal) { @@ -20,5 +20,5 @@ index 776e931c1..e1e918b21 100644 WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle(); int i = worldserver1.dimension; -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0087-Optimize-Chunk-Access.patch similarity index 96% rename from Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch rename to Spigot-Server-Patches/0087-Optimize-Chunk-Access.patch index fc292c7b0f..d5d48744b2 100644 --- a/Spigot-Server-Patches/0084-Optimize-Chunk-Access.patch +++ b/Spigot-Server-Patches/0087-Optimize-Chunk-Access.patch @@ -1,4 +1,4 @@ -From 2d8186c30c160fea877ea00f58a79ad891196543 Mon Sep 17 00:00:00 2001 +From 4f5d96217a3ec5d72b3f19f874b53fd13d506b97 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 27 Aug 2015 01:15:02 -0400 Subject: [PATCH] Optimize Chunk Access @@ -42,5 +42,5 @@ index 4e7e8e5fd..1771a1794 100644 public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, ChunkGenerator chunkgenerator) { -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0088-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 96% rename from Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch rename to Spigot-Server-Patches/0088-Configurable-spawn-chances-for-skeleton-horses.patch index c8d2816678..8488c57343 100644 --- a/Spigot-Server-Patches/0085-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0088-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,4 +1,4 @@ -From b5dd5139dd221c0f8622f60b89654a3e70c58149 Mon Sep 17 00:00:00 2001 +From 058e5610e2eb40aa6c0e06b8dabe6cb5b8d99d4c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses @@ -32,5 +32,5 @@ index d0ff0adf5..96792300c 100644 entityhorseskeleton.p(true); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0086-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0089-Optimize-isValidLocation-getType-and-getBlockData-fo.patch similarity index 98% rename from Spigot-Server-Patches/0086-Optimize-isValidLocation-getType-and-getBlockData-fo.patch rename to Spigot-Server-Patches/0089-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 7f9f03ae20..262a4fce2f 100644 --- a/Spigot-Server-Patches/0086-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0089-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -1,4 +1,4 @@ -From 0f9c4b3b846e4d401e0a54b02275a552e095993b Mon Sep 17 00:00:00 2001 +From 72e8da5083dce12fb49c57cebbab6ea0b7230f45 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:07:55 -0600 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling @@ -52,10 +52,10 @@ index 67b476b22..008ed206d 100644 public MutableBlockPosition() { this(0, 0, 0); diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 84a880561..172d00bdc 100644 +index 57b23a018..bf3b64e37 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -406,11 +406,27 @@ public class Chunk { +@@ -435,11 +435,27 @@ public class Chunk { return this.a(i, j, k).c(); } @@ -99,7 +99,7 @@ index 3d784d0dc..afdc4a779 100644 private NibbleArray skyLight; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9339bf83a..a20c9810f 100644 +index b8ae41704..8f0a306cc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -277,12 +277,12 @@ public abstract class World implements IBlockAccess { @@ -256,5 +256,5 @@ index 9339bf83a..a20c9810f 100644 } else { Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4); -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0087-Fix-cooked-fish-legacy-import.patch b/Spigot-Server-Patches/0090-Fix-cooked-fish-legacy-import.patch similarity index 91% rename from Spigot-Server-Patches/0087-Fix-cooked-fish-legacy-import.patch rename to Spigot-Server-Patches/0090-Fix-cooked-fish-legacy-import.patch index 8770c7009b..966c2c4861 100644 --- a/Spigot-Server-Patches/0087-Fix-cooked-fish-legacy-import.patch +++ b/Spigot-Server-Patches/0090-Fix-cooked-fish-legacy-import.patch @@ -1,11 +1,11 @@ -From 95d1ad0c392010288eab3405f471248e8b91ca93 Mon Sep 17 00:00:00 2001 +From 884edba128e9ff9052944693982a7fab7f95df65 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 04:32:08 -0500 Subject: [PATCH] Fix cooked fish legacy import diff --git a/src/main/java/net/minecraft/server/DataConverterMaterialId.java b/src/main/java/net/minecraft/server/DataConverterMaterialId.java -index 87b82eb3..a7c71f40 100644 +index 87b82eb35..a7c71f406 100644 --- a/src/main/java/net/minecraft/server/DataConverterMaterialId.java +++ b/src/main/java/net/minecraft/server/DataConverterMaterialId.java @@ -261,7 +261,7 @@ public class DataConverterMaterialId implements IDataConverter { @@ -18,5 +18,5 @@ index 87b82eb3..a7c71f40 100644 DataConverterMaterialId.a[352] = "minecraft:bone"; DataConverterMaterialId.a[353] = "minecraft:sugar"; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0088-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0091-Access-items-by-EquipmentSlot.patch similarity index 95% rename from Spigot-Server-Patches/0088-Access-items-by-EquipmentSlot.patch rename to Spigot-Server-Patches/0091-Access-items-by-EquipmentSlot.patch index cd62703e59..438f367a01 100644 --- a/Spigot-Server-Patches/0088-Access-items-by-EquipmentSlot.patch +++ b/Spigot-Server-Patches/0091-Access-items-by-EquipmentSlot.patch @@ -1,11 +1,11 @@ -From bf706ec07b796e1b09610c8e0231e4631bf11bd5 Mon Sep 17 00:00:00 2001 +From b0fe7f64b1dfc8d800070d347cda11ea6f146773 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:45:01 -0400 Subject: [PATCH] Access items by EquipmentSlot diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java -index 67c54899..3f58c34e 100644 +index 67c54899d..3f58c34e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java @@ -267,4 +267,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i @@ -64,5 +64,5 @@ index 67c54899..3f58c34e 100644 + // Paper end } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0089-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0092-Check-async-remove-unused-vars-GH-159.patch similarity index 93% rename from Spigot-Server-Patches/0089-Check-async-remove-unused-vars-GH-159.patch rename to Spigot-Server-Patches/0092-Check-async-remove-unused-vars-GH-159.patch index 0df3984d36..436610b122 100644 --- a/Spigot-Server-Patches/0089-Check-async-remove-unused-vars-GH-159.patch +++ b/Spigot-Server-Patches/0092-Check-async-remove-unused-vars-GH-159.patch @@ -1,11 +1,11 @@ -From 8f7efee55b677903cf40c93b21b00163a9e8b1e1 Mon Sep 17 00:00:00 2001 +From 29ffb89527cbf4bc5312c099877f79a4808b54dc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 27 Mar 2016 20:24:05 -0500 Subject: [PATCH] Check async, remove unused vars, GH-159 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 68a04532..45a83ae9 100644 +index 68a045323..45a83ae99 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -40,6 +40,7 @@ public final class SpawnerCreature { @@ -28,5 +28,5 @@ index 68a04532..45a83ae9 100644 if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) { BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0090-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0093-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch similarity index 97% rename from Spigot-Server-Patches/0090-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch rename to Spigot-Server-Patches/0093-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch index 9e8127fe4c..22e3b1ce4e 100644 --- a/Spigot-Server-Patches/0090-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch +++ b/Spigot-Server-Patches/0093-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch @@ -1,4 +1,4 @@ -From 43603ffdc597090900d1a6243f17282846427add Mon Sep 17 00:00:00 2001 +From d03b75f5e4ea7e6ff34ebc7651c9a86e2550c6ef Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone @@ -25,7 +25,7 @@ index 38d664e00..e634c3afd 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 93257a38e..d8d1a4c77 100644 +index 8f0a306cc..74ae80646 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -582,7 +582,7 @@ public abstract class World implements IBlockAccess { @@ -67,5 +67,5 @@ index 96792300c..ebe397116 100644 timing.stopTiming(); // Paper } else { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0091-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0094-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 90% rename from Spigot-Server-Patches/0091-Entity-AddTo-RemoveFrom-World-Events.patch rename to Spigot-Server-Patches/0094-Entity-AddTo-RemoveFrom-World-Events.patch index d3161699b5..8345860f35 100644 --- a/Spigot-Server-Patches/0091-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0094-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,11 +1,11 @@ -From c656be4ffec7d9daac8f8278ecf04bb13b568744 Mon Sep 17 00:00:00 2001 +From 3ed61703830d84e115bc1a5b009e756735ce2ee7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:32:58 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 03f07677..97499aeb 100644 +index 74ae80646..119cd0636 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1185,6 +1185,7 @@ public abstract class World implements IBlockAccess { @@ -25,5 +25,5 @@ index 03f07677..97499aeb 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0092-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0095-Configurable-Chunk-Inhabited-Timer.patch similarity index 90% rename from Spigot-Server-Patches/0092-Configurable-Chunk-Inhabited-Timer.patch rename to Spigot-Server-Patches/0095-Configurable-Chunk-Inhabited-Timer.patch index 948547f318..dc2f83a0f6 100644 --- a/Spigot-Server-Patches/0092-Configurable-Chunk-Inhabited-Timer.patch +++ b/Spigot-Server-Patches/0095-Configurable-Chunk-Inhabited-Timer.patch @@ -1,4 +1,4 @@ -From a85c4e1bb03849fd93ad1bbc0fafb823b8e086f3 Mon Sep 17 00:00:00 2001 +From e2eb0375f3b5fa6b9d074ee6d8551732eb8e37a7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Timer @@ -23,10 +23,10 @@ index e634c3afd..54f23ea75 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 172d00bdc..300a56191 100644 +index bf3b64e37..6b13e1d7d 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -1408,7 +1408,7 @@ public class Chunk { +@@ -1445,7 +1445,7 @@ public class Chunk { } public long x() { @@ -36,5 +36,5 @@ index 172d00bdc..300a56191 100644 public void c(long i) { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0093-EntityPathfindEvent.patch b/Spigot-Server-Patches/0096-EntityPathfindEvent.patch similarity index 94% rename from Spigot-Server-Patches/0093-EntityPathfindEvent.patch rename to Spigot-Server-Patches/0096-EntityPathfindEvent.patch index 600efe788b..6d205755da 100644 --- a/Spigot-Server-Patches/0093-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0096-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From c0bd0c65c216796321650a58bd0fd505ef23406b Mon Sep 17 00:00:00 2001 +From 341c685efb02986f52f829c1a7c56357ce0ad071 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:22:26 -0400 Subject: [PATCH] EntityPathfindEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index cc44d30b..3ac6f84d 100644 +index cc44d30b5..3ac6f84d3 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -4,7 +4,7 @@ import javax.annotation.Nullable; @@ -35,5 +35,5 @@ index cc44d30b..3ac6f84d 100644 float f = this.i(); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0094-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/Spigot-Server-Patches/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch similarity index 96% rename from Spigot-Server-Patches/0094-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch rename to Spigot-Server-Patches/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch index a4ee42e292..432d9ec485 100644 --- a/Spigot-Server-Patches/0094-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch +++ b/Spigot-Server-Patches/0097-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch @@ -1,4 +1,4 @@ -From 430494f70a3e392c7c90dc61bea75e6aea263c38 Mon Sep 17 00:00:00 2001 +From 8a9b221bcd755747f0e03bb84f9ba7403eaac7fd Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 22:03:09 -0400 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks @@ -12,7 +12,7 @@ of unloaded chunks anyways. This keeps behavior consistent, vs inconsistent flowing based on plugin triggered loads. diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index 739b9aac..ff90e08e 100644 +index 739b9aac3..ff90e08eb 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -96,6 +96,7 @@ public class BlockFlowing extends BlockFluids { @@ -48,5 +48,5 @@ index 739b9aac..ff90e08e 100644 if (this.material == Material.LAVA) { this.fizz(world, blockposition); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0095-Reduce-IO-ops-opening-a-new-region-file.patch b/Spigot-Server-Patches/0098-Reduce-IO-ops-opening-a-new-region-file.patch similarity index 94% rename from Spigot-Server-Patches/0095-Reduce-IO-ops-opening-a-new-region-file.patch rename to Spigot-Server-Patches/0098-Reduce-IO-ops-opening-a-new-region-file.patch index 9656b2dc42..5245e68f98 100644 --- a/Spigot-Server-Patches/0095-Reduce-IO-ops-opening-a-new-region-file.patch +++ b/Spigot-Server-Patches/0098-Reduce-IO-ops-opening-a-new-region-file.patch @@ -1,11 +1,11 @@ -From 3f1afe5e7b801093fabae4b6a17daeecd27e258c Mon Sep 17 00:00:00 2001 +From b4237ef0e075d98a14b87bfd673d34b96cb1d966 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 06:56:23 +0300 Subject: [PATCH] Reduce IO ops opening a new region file. diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 5bcbd718..2bd85e2d 100644 +index 5bcbd718f..2bd85e2d1 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -8,9 +8,12 @@ import java.io.ByteArrayInputStream; @@ -49,5 +49,5 @@ index 5bcbd718..2bd85e2d 100644 } } catch (IOException ioexception) { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0096-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0099-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 95% rename from Spigot-Server-Patches/0096-Sanitise-RegionFileCache-and-make-configurable.patch rename to Spigot-Server-Patches/0099-Sanitise-RegionFileCache-and-make-configurable.patch index 0ec22d6c6c..f9e5e728ea 100644 --- a/Spigot-Server-Patches/0096-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/Spigot-Server-Patches/0099-Sanitise-RegionFileCache-and-make-configurable.patch @@ -1,4 +1,4 @@ -From 30fa5aba6e6c64938c45d420e8856c3fefdf3e58 Mon Sep 17 00:00:00 2001 +From cd7e6fdcb9ae8a70617251f82975bb67c14d51a0 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 08:22:55 +0300 Subject: [PATCH] Sanitise RegionFileCache and make configurable. @@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap). The maximum size of the RegionFileCache is also made configurable. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 2f6e169f..ec464338 100644 +index 2f6e169f5..ec4643384 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -215,4 +215,9 @@ public class PaperConfig { @@ -25,7 +25,7 @@ index 2f6e169f..ec464338 100644 + } } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 5f9e9dde..7e756580 100644 +index 5f9e9ddef..7e7565807 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -8,10 +8,12 @@ import java.io.File; @@ -77,5 +77,5 @@ index 5f9e9dde..7e756580 100644 Iterator iterator = RegionFileCache.a.values().iterator(); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0097-Use-Optimized-Collections.patch b/Spigot-Server-Patches/0100-Use-Optimized-Collections.patch similarity index 94% rename from Spigot-Server-Patches/0097-Use-Optimized-Collections.patch rename to Spigot-Server-Patches/0100-Use-Optimized-Collections.patch index e9876746d6..c164ab1300 100644 --- a/Spigot-Server-Patches/0097-Use-Optimized-Collections.patch +++ b/Spigot-Server-Patches/0100-Use-Optimized-Collections.patch @@ -1,4 +1,4 @@ -From f2a16d213b5259477eb5bdb9790116c5a627b13b Mon Sep 17 00:00:00 2001 +From d97129376d57c631b43c07d37bf8bc5af9081036 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 02:13:24 -0400 Subject: [PATCH] Use Optimized Collections @@ -13,7 +13,7 @@ These collections are super fast as seen http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/ diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java -index 1507f97f..fe848445 100644 +index 1507f97fd..fe8484453 100644 --- a/src/main/java/net/minecraft/server/DataWatcher.java +++ b/src/main/java/net/minecraft/server/DataWatcher.java @@ -12,6 +12,7 @@ import java.util.Map; @@ -34,5 +34,5 @@ index 1507f97f..fe848445 100644 private boolean f = true; private boolean g; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0098-Do-not-load-chunks-for-light-checks.patch b/Spigot-Server-Patches/0101-Do-not-load-chunks-for-light-checks.patch similarity index 89% rename from Spigot-Server-Patches/0098-Do-not-load-chunks-for-light-checks.patch rename to Spigot-Server-Patches/0101-Do-not-load-chunks-for-light-checks.patch index 4f9c0f61d5..0d1bd84177 100644 --- a/Spigot-Server-Patches/0098-Do-not-load-chunks-for-light-checks.patch +++ b/Spigot-Server-Patches/0101-Do-not-load-chunks-for-light-checks.patch @@ -1,4 +1,4 @@ -From bbb44b54bb0a777d7b3907688af0cf057396d725 Mon Sep 17 00:00:00 2001 +From e684a193f95395b7881bd0d96a1961ac00aa40b9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for light checks @@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 97499aeb..279f0a26 100644 +index 119cd0636..5d5003920 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -764,6 +764,7 @@ public abstract class World implements IBlockAccess { @@ -19,5 +19,5 @@ index 97499aeb..279f0a26 100644 Chunk chunk = this.getChunkAtWorldCoords(blockposition); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0099-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0102-Add-PlayerUseUnknownEntityEvent.patch similarity index 92% rename from Spigot-Server-Patches/0099-Add-PlayerUseUnknownEntityEvent.patch rename to Spigot-Server-Patches/0102-Add-PlayerUseUnknownEntityEvent.patch index 61bcbddde2..b6fa875d79 100644 --- a/Spigot-Server-Patches/0099-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0102-Add-PlayerUseUnknownEntityEvent.patch @@ -1,11 +1,11 @@ -From 53c71782706b642bce798cd5af6b32cea8bd2ecd Mon Sep 17 00:00:00 2001 +From 7ab10243bd61164ab6a53c0753019ad649d244ce Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:09:16 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java -index c67cb54a..521f4626 100644 +index c67cb54a3..521f46262 100644 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; @@ -18,7 +18,7 @@ index c67cb54a..521f4626 100644 private Vec3D c; private EnumHand d; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5cc5dbcd..70fb4f6b 100644 +index e1b85ebae..7c708a0de 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1657,6 +1657,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -39,5 +39,5 @@ index 5cc5dbcd..70fb4f6b 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0100-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0103-Fix-reducedDebugInfo-not-initialized-on-client.patch similarity index 91% rename from Spigot-Server-Patches/0100-Fix-reducedDebugInfo-not-initialized-on-client.patch rename to Spigot-Server-Patches/0103-Fix-reducedDebugInfo-not-initialized-on-client.patch index f13217b543..571220ca98 100644 --- a/Spigot-Server-Patches/0100-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0103-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,11 +1,11 @@ -From e389317bbc486c5205df6f61bf88c76981a5d0f2 Mon Sep 17 00:00:00 2001 +From a57a1c5796e35a26f93d9d93f7c5da66e2d39429 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 20:37:03 -0400 Subject: [PATCH] Fix reducedDebugInfo not initialized on client diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index b38ff689..7bdd5bcf 100644 +index bf7aaebd6..baf288210 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -160,6 +160,7 @@ public abstract class PlayerList { @@ -17,5 +17,5 @@ index b38ff689..7bdd5bcf 100644 entityplayer.getStatisticManager().c(); entityplayer.F().a(entityplayer); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0101-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0104-Configurable-Grass-Spread-Tick-Rate.patch similarity index 96% rename from Spigot-Server-Patches/0101-Configurable-Grass-Spread-Tick-Rate.patch rename to Spigot-Server-Patches/0104-Configurable-Grass-Spread-Tick-Rate.patch index 26822a24e0..7bcc30af1f 100644 --- a/Spigot-Server-Patches/0101-Configurable-Grass-Spread-Tick-Rate.patch +++ b/Spigot-Server-Patches/0104-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,4 +1,4 @@ -From 41feb93bbf2a80cf7b0cf54e790a7df29a05113d Mon Sep 17 00:00:00 2001 +From 1c4d9e55d2affd7f99f33105071fa181e6c11f07 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 16:28:17 -0400 Subject: [PATCH] Configurable Grass Spread Tick Rate @@ -32,5 +32,5 @@ index 8fc736d6a..b656994b2 100644 int lightLevel = -1; // Paper if (world.getType(blockposition.up()).c() > 2 && (lightLevel = world.getLightLevel(blockposition.up())) < 4) { // Paper - move light check to end to avoid unneeded light lookups -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0102-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0105-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 97% rename from Spigot-Server-Patches/0102-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to Spigot-Server-Patches/0105-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 5b442f9acd..adb03c575f 100644 --- a/Spigot-Server-Patches/0102-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0105-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From ed62436c4f4f130cd0834ac490924f9d9de101bc Mon Sep 17 00:00:00 2001 +From 1cf126b0bdcfd085600588c678c1a9816c2ed64f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -39,7 +39,7 @@ index 4e8ce79ff..2300ee10b 100644 if (i1 - j > 1000L) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 279f0a261..a0b36b6ba 100644 +index 5d5003920..671927d5c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -3200,8 +3200,9 @@ public abstract class World implements IBlockAccess { @@ -83,5 +83,5 @@ index 01fc193db..69dc11e2b 100644 loadChunk(chunkCoordX + x, chunkCoordZ + z); } else { -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0103-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0106-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 88% rename from Spigot-Server-Patches/0103-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to Spigot-Server-Patches/0106-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index fecbdbb1c8..c39847ba73 100644 --- a/Spigot-Server-Patches/0103-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0106-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,11 +1,11 @@ -From 904c8ee708739505f983b39cf809a39731b3d7fa Mon Sep 17 00:00:00 2001 +From 028a5e25797aa9af68282959cf9ef89755eade7c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 17:48:50 -0400 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a0b36b6b..f78298a5 100644 +index 671927d5c..1189720de 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -536,6 +536,7 @@ public abstract class World implements IBlockAccess { @@ -17,5 +17,5 @@ index a0b36b6b..f78298a5 100644 this.a(blockposition.east(), block, blockposition); this.a(blockposition.down(), block, blockposition); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0104-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0107-Don-t-spam-reload-spawn-chunks-in-nether-end.patch similarity index 92% rename from Spigot-Server-Patches/0104-Don-t-spam-reload-spawn-chunks-in-nether-end.patch rename to Spigot-Server-Patches/0107-Don-t-spam-reload-spawn-chunks-in-nether-end.patch index f8fc21ca69..371d429a8b 100644 --- a/Spigot-Server-Patches/0104-Don-t-spam-reload-spawn-chunks-in-nether-end.patch +++ b/Spigot-Server-Patches/0107-Don-t-spam-reload-spawn-chunks-in-nether-end.patch @@ -1,11 +1,11 @@ -From 3a050fdc3e3b84d8a030942b18773b80a6de7c6b Mon Sep 17 00:00:00 2001 +From 98af7220cc151b5d19148fabfc24c66f15fca41c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 19:42:22 -0400 Subject: [PATCH] Don't spam reload spawn chunks in nether/end diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f78298a5a..e2efbf8cb 100644 +index 1189720de..ad422b24b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -3196,6 +3196,7 @@ public abstract class World implements IBlockAccess { @@ -29,5 +29,5 @@ index d0265f960..35d8d1a6e 100644 } } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0105-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0108-Remove-Debug-checks-from-DataBits.patch similarity index 93% rename from Spigot-Server-Patches/0105-Remove-Debug-checks-from-DataBits.patch rename to Spigot-Server-Patches/0108-Remove-Debug-checks-from-DataBits.patch index 947b95f10c..d6011b7624 100644 --- a/Spigot-Server-Patches/0105-Remove-Debug-checks-from-DataBits.patch +++ b/Spigot-Server-Patches/0108-Remove-Debug-checks-from-DataBits.patch @@ -1,4 +1,4 @@ -From 205a256bba1c494d95d6e42674eb8c2502b57480 Mon Sep 17 00:00:00 2001 +From d097ae862c5d2aa16d9ba2999604b63ef62734e5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 21:38:58 -0400 Subject: [PATCH] Remove Debug checks from DataBits @@ -9,7 +9,7 @@ Before: http://i.imgur.com/nQsMzAE.png After: http://i.imgur.com/nJ46crB.png diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index f3a6799a..fa0fd8a9 100644 +index f3a6799a8..fa0fd8a9c 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -10,7 +10,7 @@ public class DataBits { @@ -42,5 +42,5 @@ index f3a6799a..fa0fd8a9 100644 int k = j / 64; int l = ((i + 1) * this.b - 1) / 64; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0109-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 92% rename from Spigot-Server-Patches/0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to Spigot-Server-Patches/0109-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index 44cf60fb2c..5332d08d96 100644 --- a/Spigot-Server-Patches/0106-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/0109-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -1,4 +1,4 @@ -From 2de4f92207050a52d5a48b1b0c1541d3e7a71505 Mon Sep 17 00:00:00 2001 +From 707f3e9ccf6dd76cc11dbfd61a6ffaf74f563fa6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 6 Apr 2016 01:04:23 -0500 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names @@ -19,10 +19,10 @@ index abc1aabdd..6ea608ba9 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e1e918b21..dfdbbd733 100644 +index d4ab5fba9..7314b4dc5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2078,6 +2078,7 @@ public abstract class Entity implements ICommandListener { +@@ -2097,6 +2097,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper return this.getFlag(5); } @@ -51,5 +51,5 @@ index 7c708a0de..9eb7b012f 100644 if (((LazyPlayerSet) event.getRecipients()).isLazy()) { for (Object recipient : minecraftServer.getPlayerList().players) { -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0107-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0110-Workaround-for-setting-passengers-on-players.patch similarity index 94% rename from Spigot-Server-Patches/0107-Workaround-for-setting-passengers-on-players.patch rename to Spigot-Server-Patches/0110-Workaround-for-setting-passengers-on-players.patch index b56e63de1f..46c3b1e8c6 100644 --- a/Spigot-Server-Patches/0107-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0110-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From 4703e81cf7aa0dd2c059bcc093803bcf1ed2941f Mon Sep 17 00:00:00 2001 +From 5f6964d74c8c3c114cb90acbc09febeaa45dad66 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players @@ -28,5 +28,5 @@ index aa7751059..0eee46edd 100644 public void setSneaking(boolean sneak) { getHandle().setSneaking(sneak); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0108-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0111-Remove-unused-World-Tile-Entity-List.patch similarity index 97% rename from Spigot-Server-Patches/0108-Remove-unused-World-Tile-Entity-List.patch rename to Spigot-Server-Patches/0111-Remove-unused-World-Tile-Entity-List.patch index 5efd843dff..641b0c4f99 100644 --- a/Spigot-Server-Patches/0108-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0111-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From 881a1ab825255f0e7f97094eebfd4b39fbca180c Mon Sep 17 00:00:00 2001 +From 924f55aabda02b31745c2c49433e560cd4f2d692 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:25:28 -0400 Subject: [PATCH] Remove unused World Tile Entity List @@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List Massive hit to performance and it is completely unnecessary. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e2efbf8cb..aae2d5786 100644 +index ad422b24b..5f92355db 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -69,7 +69,7 @@ public abstract class World implements IBlockAccess { @@ -67,5 +67,5 @@ index e2efbf8cb..aae2d5786 100644 } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0109-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0112-Don-t-tick-Skulls-unused-code.patch similarity index 87% rename from Spigot-Server-Patches/0109-Don-t-tick-Skulls-unused-code.patch rename to Spigot-Server-Patches/0112-Don-t-tick-Skulls-unused-code.patch index b4c8a14b9f..2880cfa5e9 100644 --- a/Spigot-Server-Patches/0109-Don-t-tick-Skulls-unused-code.patch +++ b/Spigot-Server-Patches/0112-Don-t-tick-Skulls-unused-code.patch @@ -1,11 +1,11 @@ -From 66c73c93aedcd3516e703a66d561702b3e3be592 Mon Sep 17 00:00:00 2001 +From ac45d8457a0c7eae58e0b9feebedd4e415bd383e Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:30:10 -0400 Subject: [PATCH] Don't tick Skulls - unused code diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index 1e3c687d..ba02a17e 100644 +index a796c08ab..dd2665881 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -24,7 +24,7 @@ import com.mojang.authlib.ProfileLookupCallback; @@ -18,5 +18,5 @@ index 1e3c687d..ba02a17e 100644 private int a; public int rotation; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0113-Configurable-Player-Collision.patch similarity index 98% rename from Spigot-Server-Patches/0110-Configurable-Player-Collision.patch rename to Spigot-Server-Patches/0113-Configurable-Player-Collision.patch index 48f263e1f2..d7bb5f9952 100644 --- a/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0113-Configurable-Player-Collision.patch @@ -1,4 +1,4 @@ -From 5744f20685d11629777842ce23968b85fdb39714 Mon Sep 17 00:00:00 2001 +From 10c2e6d3aef1221db2bc29f97cedc0b3c44bddf8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision @@ -75,7 +75,7 @@ index 549d4e89d..df11764e0 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index e589cc827..3fc242e4b 100644 +index baf288210..950dbdc50 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -74,6 +74,7 @@ public abstract class PlayerList { @@ -132,5 +132,5 @@ index e589cc827..3fc242e4b 100644 // CraftBukkit start -- -2.16.3 +2.18.0 diff --git a/Spigot-Server-Patches/0111-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-Server-Patches/0114-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 96% rename from Spigot-Server-Patches/0111-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to Spigot-Server-Patches/0114-Add-handshake-event-to-allow-plugins-to-handle-clien.patch index 3c2c553335..2713cc18cc 100644 --- a/Spigot-Server-Patches/0111-Add-handshake-event-to-allow-plugins-to-handle-clien.patch +++ b/Spigot-Server-Patches/0114-Add-handshake-event-to-allow-plugins-to-handle-clien.patch @@ -1,4 +1,4 @@ -From 081f293feece1336335e05b0d634e09b05cdc753 Mon Sep 17 00:00:00 2001 +From 4680099c5915c8bc2ad1f64d3e1899efe5430da8 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 13 Apr 2016 20:21:38 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index c3c9c3c1..309ab18d 100644 +index c3c9c3c1f..309ab18df 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -45,5 +45,5 @@ index c3c9c3c1..309ab18d 100644 if ( split.length == 3 || split.length == 4 ) { packethandshakinginsetprotocol.hostname = split[0]; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0112-Water-mobs-should-only-spawn-in-the-water.patch b/Spigot-Server-Patches/0115-Water-mobs-should-only-spawn-in-the-water.patch similarity index 91% rename from Spigot-Server-Patches/0112-Water-mobs-should-only-spawn-in-the-water.patch rename to Spigot-Server-Patches/0115-Water-mobs-should-only-spawn-in-the-water.patch index 1415872c4b..451ce22a4b 100644 --- a/Spigot-Server-Patches/0112-Water-mobs-should-only-spawn-in-the-water.patch +++ b/Spigot-Server-Patches/0115-Water-mobs-should-only-spawn-in-the-water.patch @@ -1,11 +1,11 @@ -From 54ad0664727a5d06f10a13f8e3469203caf2b370 Mon Sep 17 00:00:00 2001 +From 3f31cdecde77021afea54370f1fb31ef0621b59f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 14 Apr 2016 17:48:56 -0500 Subject: [PATCH] Water mobs should only spawn in the water diff --git a/src/main/java/net/minecraft/server/EntityWaterAnimal.java b/src/main/java/net/minecraft/server/EntityWaterAnimal.java -index f430bdee..0597edad 100644 +index f430bdeec..0597edad6 100644 --- a/src/main/java/net/minecraft/server/EntityWaterAnimal.java +++ b/src/main/java/net/minecraft/server/EntityWaterAnimal.java @@ -11,7 +11,15 @@ public abstract class EntityWaterAnimal extends EntityInsentient implements IAni @@ -26,5 +26,5 @@ index f430bdee..0597edad 100644 public boolean canSpawn() { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0113-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/Spigot-Server-Patches/0116-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch similarity index 93% rename from Spigot-Server-Patches/0113-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch rename to Spigot-Server-Patches/0116-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch index b7c4e521e7..08c20bb605 100644 --- a/Spigot-Server-Patches/0113-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch +++ b/Spigot-Server-Patches/0116-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch @@ -1,4 +1,4 @@ -From f47639cb7c51dfa19cfd33bc6fa1346071430a1b Mon Sep 17 00:00:00 2001 +From 2f2537d89386121b38fd335b5b8d48102a97d8ae Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 14 Apr 2016 21:01:39 -0400 Subject: [PATCH] Fix Bugs with Spigot Mob Spawn Logic @@ -14,10 +14,10 @@ Specially with servers using smaller mob spawn ranges than view distance, as wel This patch returns mob counting to use all loaded chunks, and 17x17 division. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 300a5619..ecc76a88 100644 +index 6b13e1d7d..1e78fc625 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -683,7 +683,7 @@ public class Chunk { +@@ -716,7 +716,7 @@ public class Chunk { i = this.entitySlices.length - 1; } @@ -27,7 +27,7 @@ index 300a5619..ecc76a88 100644 if (entity instanceof EntityItem) { itemCounts[i]--; diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 45a83ae9..2cd06382 100644 +index 45a83ae99..2cd063829 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -23,6 +23,15 @@ public final class SpawnerCreature { @@ -56,5 +56,5 @@ index 45a83ae9..2cd06382 100644 Iterator iterator1 = this.b.iterator(); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0114-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0117-Configurable-RCON-IP-address.patch similarity index 90% rename from Spigot-Server-Patches/0114-Configurable-RCON-IP-address.patch rename to Spigot-Server-Patches/0117-Configurable-RCON-IP-address.patch index 8df965aa88..a27de8db74 100644 --- a/Spigot-Server-Patches/0114-Configurable-RCON-IP-address.patch +++ b/Spigot-Server-Patches/0117-Configurable-RCON-IP-address.patch @@ -1,4 +1,4 @@ -From d306385653a27fdd7ab3ec0a02daab1ed7c3423f Mon Sep 17 00:00:00 2001 +From 5381880d6b4b91e8b8cf2377ba8a09a7eb5d4cc0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Apr 2016 00:39:33 -0400 Subject: [PATCH] Configurable RCON IP address @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable RCON IP address For servers with multiple IP's, ability to bind to a specific interface. diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java -index a6a0d5a2..efcafe77 100644 +index a6a0d5a29..efcafe77f 100644 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java @@ -24,7 +24,7 @@ public class RemoteControlListener extends RemoteConnectionThread { @@ -19,5 +19,5 @@ index a6a0d5a2..efcafe77 100644 if (0 == this.h) { this.h = this.i + 10; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0115-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0118-Prevent-Fire-from-loading-chunks.patch similarity index 95% rename from Spigot-Server-Patches/0115-Prevent-Fire-from-loading-chunks.patch rename to Spigot-Server-Patches/0118-Prevent-Fire-from-loading-chunks.patch index 54cbf3fa39..dd6d36f24b 100644 --- a/Spigot-Server-Patches/0115-Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0118-Prevent-Fire-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 79ca517dfc368927a111b63fcfdc81c5a4d03814 Mon Sep 17 00:00:00 2001 +From 419c239883797136eb0bbde7cdb5bfd8841d37e6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Apr 2016 17:27:09 -0400 Subject: [PATCH] Prevent Fire from loading chunks @@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall bad behavior. diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index a3a5c853..6832a19a 100644 +index a3a5c853c..6832a19af 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -164,6 +164,7 @@ public class BlockFire extends Block { @@ -43,5 +43,5 @@ index a3a5c853..6832a19a 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0116-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0119-Implement-PlayerLocaleChangeEvent.patch similarity index 97% rename from Spigot-Server-Patches/0116-Implement-PlayerLocaleChangeEvent.patch rename to Spigot-Server-Patches/0119-Implement-PlayerLocaleChangeEvent.patch index ce563b67ed..992e665c40 100644 --- a/Spigot-Server-Patches/0116-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0119-Implement-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From 2b9856956c8f5819c2abbbe0f11a9104896b4400 Mon Sep 17 00:00:00 2001 +From 4dafbc193f7f87f87eff67ac6b4cec08ea43227b Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent @@ -71,5 +71,5 @@ index 0eee46edd..98e9da59a 100644 @Override -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0117-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0120-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 93% rename from Spigot-Server-Patches/0117-EntityRegainHealthEvent-isFastRegen-API.patch rename to Spigot-Server-Patches/0120-EntityRegainHealthEvent-isFastRegen-API.patch index 2c2263eadc..19a7b25a88 100644 --- a/Spigot-Server-Patches/0117-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0120-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From 734417b2c0f433c584b575829b66deafd32663eb Mon Sep 17 00:00:00 2001 +From 66452482b3e19d2cb4b1c67a60345302bc8fc29f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API Don't even get me started diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 296c0548..a09d8964 100644 +index a92b89d7c..4b6bb38ae 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -773,10 +773,16 @@ public abstract class EntityLiving extends Entity { @@ -28,7 +28,7 @@ index 296c0548..a09d8964 100644 if (!event.isCancelled()) { diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java -index d42db9b4..c715138e 100644 +index d42db9b45..c715138ee 100644 --- a/src/main/java/net/minecraft/server/FoodMetaData.java +++ b/src/main/java/net/minecraft/server/FoodMetaData.java @@ -65,7 +65,7 @@ public class FoodMetaData { @@ -41,5 +41,5 @@ index d42db9b4..c715138e 100644 this.foodTickTimer = 0; } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0118-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0121-Add-ability-to-configure-frosted_ice-properties.patch similarity index 97% rename from Spigot-Server-Patches/0118-Add-ability-to-configure-frosted_ice-properties.patch rename to Spigot-Server-Patches/0121-Add-ability-to-configure-frosted_ice-properties.patch index 2504baa385..c656c2e7de 100644 --- a/Spigot-Server-Patches/0118-Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/0121-Add-ability-to-configure-frosted_ice-properties.patch @@ -1,4 +1,4 @@ -From 64fb6f3595eb66bc805be1ec9f07d815277a18cb Mon Sep 17 00:00:00 2001 +From b3b76f21bc0e86a173661b9fa351c886b89394e3 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 21 Apr 2016 23:51:55 -0700 Subject: [PATCH] Add ability to configure frosted_ice properties @@ -44,5 +44,5 @@ index 950863fb9..a8dbbf20a 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0119-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0122-Vehicle-Event-Cancellation-Changes.patch similarity index 84% rename from Spigot-Server-Patches/0119-Vehicle-Event-Cancellation-Changes.patch rename to Spigot-Server-Patches/0122-Vehicle-Event-Cancellation-Changes.patch index 5d1e27dfb6..04eae9c63a 100644 --- a/Spigot-Server-Patches/0119-Vehicle-Event-Cancellation-Changes.patch +++ b/Spigot-Server-Patches/0122-Vehicle-Event-Cancellation-Changes.patch @@ -1,14 +1,14 @@ -From c279234680e98b4f1fe19f9d4cd1257328dabb39 Mon Sep 17 00:00:00 2001 +From e68a92dac303b69a9ef4935be8935e649a415431 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 18:20:05 -0500 Subject: [PATCH] Vehicle Event Cancellation Changes diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index dfdbbd733..36c9bd418 100644 +index 7314b4dc5..d1f07bbbd 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -70,7 +70,7 @@ public abstract class Entity implements ICommandListener { +@@ -70,7 +70,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper public boolean i; public final List passengers; protected int j; @@ -17,7 +17,7 @@ index dfdbbd733..36c9bd418 100644 public boolean attachedToPlayer; public World world; public double lastX; -@@ -1960,6 +1960,7 @@ public abstract class Entity implements ICommandListener { +@@ -1979,6 +1979,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)"); } else { // CraftBukkit start @@ -25,7 +25,7 @@ index dfdbbd733..36c9bd418 100644 CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle(); Entity orig = craft == null ? null : craft.getHandle(); if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) { -@@ -1975,7 +1976,13 @@ public abstract class Entity implements ICommandListener { +@@ -1994,7 +1995,13 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } } // CraftBukkit end @@ -41,5 +41,5 @@ index dfdbbd733..36c9bd418 100644 entity.j = 60; } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0120-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch b/Spigot-Server-Patches/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch similarity index 94% rename from Spigot-Server-Patches/0120-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch rename to Spigot-Server-Patches/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch index 63b441d732..52f6863bab 100644 --- a/Spigot-Server-Patches/0120-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch +++ b/Spigot-Server-Patches/0123-SPIGOT-1401-Fix-dispenser-dropper-furnace-placement.patch @@ -1,11 +1,11 @@ -From 362cd74f957ff26045449b2192a05407332e2999 Mon Sep 17 00:00:00 2001 +From 7e347eb480cfb1eecd76b0c6fbc08090e439f8d5 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 24 Apr 2016 19:49:33 -0500 Subject: [PATCH] SPIGOT-1401: Fix dispenser, dropper, furnace placement diff --git a/src/main/java/net/minecraft/server/BlockDispenser.java b/src/main/java/net/minecraft/server/BlockDispenser.java -index 8e794976..539b2b3c 100644 +index 8e794976a..539b2b3ce 100644 --- a/src/main/java/net/minecraft/server/BlockDispenser.java +++ b/src/main/java/net/minecraft/server/BlockDispenser.java @@ -20,6 +20,9 @@ public class BlockDispenser extends BlockTileEntity { @@ -28,7 +28,7 @@ index 8e794976..539b2b3c 100644 public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) { if (world.isClientSide) { diff --git a/src/main/java/net/minecraft/server/BlockFurnace.java b/src/main/java/net/minecraft/server/BlockFurnace.java -index b6834d2d..dae71170 100644 +index b6834d2d1..dae711708 100644 --- a/src/main/java/net/minecraft/server/BlockFurnace.java +++ b/src/main/java/net/minecraft/server/BlockFurnace.java @@ -18,6 +18,9 @@ public class BlockFurnace extends BlockTileEntity { @@ -51,5 +51,5 @@ index b6834d2d..dae71170 100644 public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) { if (world.isClientSide) { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0121-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0124-remove-null-possibility-for-getServer-singleton.patch similarity index 96% rename from Spigot-Server-Patches/0121-remove-null-possibility-for-getServer-singleton.patch rename to Spigot-Server-Patches/0124-remove-null-possibility-for-getServer-singleton.patch index 1d30749e16..0dbecc755f 100644 --- a/Spigot-Server-Patches/0121-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0124-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From 1440a91b37f0d9bb7939fb889d013a559599bc0b Mon Sep 17 00:00:00 2001 +From ce05afd0428918d9eab5599842bc9f2a485120f9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton @@ -35,5 +35,5 @@ index b6c4d98fd..45d3dbde2 100644 // CraftBukkit end } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0122-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0125-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 99% rename from Spigot-Server-Patches/0122-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to Spigot-Server-Patches/0125-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index de4017abe1..d869119b9b 100644 --- a/Spigot-Server-Patches/0122-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0125-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From 267814cc56f9f9150950dde6c1f9c9407c3c4243 Mon Sep 17 00:00:00 2001 +From ed9719aea67d9235b946eeb5e93922c4ceda3707 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Apr 2016 20:02:00 -0400 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes @@ -145,5 +145,5 @@ index 256a13178..5768cd512 100644 public RenderData() { -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0123-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0126-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 99% rename from Spigot-Server-Patches/0123-LootTable-API-Replenishable-Lootables-Feature.patch rename to Spigot-Server-Patches/0126-LootTable-API-Replenishable-Lootables-Feature.patch index e864ff5c23..5f4ce59772 100644 --- a/Spigot-Server-Patches/0123-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0126-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From 72ecf0a094c609382a42d214b204499eb35c00fd Mon Sep 17 00:00:00 2001 +From e390dbccabd0c678c953bc4769e771a54e4c38bb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 21:19:14 -0400 Subject: [PATCH] LootTable API & Replenishable Lootables Feature @@ -791,5 +791,5 @@ index e9963e21c..acb4dee04 100644 CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) { -- -2.16.1.windows.1 +2.18.0 diff --git a/Spigot-Server-Patches/0124-Do-not-load-chunks-for-pathfinding.patch b/Spigot-Server-Patches/0127-Do-not-load-chunks-for-pathfinding.patch similarity index 91% rename from Spigot-Server-Patches/0124-Do-not-load-chunks-for-pathfinding.patch rename to Spigot-Server-Patches/0127-Do-not-load-chunks-for-pathfinding.patch index 3671d31b1d..92f72311ad 100644 --- a/Spigot-Server-Patches/0124-Do-not-load-chunks-for-pathfinding.patch +++ b/Spigot-Server-Patches/0127-Do-not-load-chunks-for-pathfinding.patch @@ -1,4 +1,4 @@ -From ebc4bbdd5d6af533fc0d756001be9381e14040ef Mon Sep 17 00:00:00 2001 +From a49583a3643759dfa8082967cbb3ff44021d6394 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Jan 2016 00:13:19 -0500 Subject: [PATCH] Do not load chunks for pathfinding @@ -18,5 +18,5 @@ index 08b986fd7..786d1dd22 100644 } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0125-Entity-Tracking-Improvements.patch b/Spigot-Server-Patches/0128-Entity-Tracking-Improvements.patch similarity index 96% rename from Spigot-Server-Patches/0125-Entity-Tracking-Improvements.patch rename to Spigot-Server-Patches/0128-Entity-Tracking-Improvements.patch index 8d7475269a..9430cc7514 100644 --- a/Spigot-Server-Patches/0125-Entity-Tracking-Improvements.patch +++ b/Spigot-Server-Patches/0128-Entity-Tracking-Improvements.patch @@ -1,4 +1,4 @@ -From 9d7e877321c25b62579877a65df3564f47c7a216 Mon Sep 17 00:00:00 2001 +From 2c29fda252395dc3caf19e77deea3ef876473ace Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Jun 2013 01:24:00 -0400 Subject: [PATCH] Entity Tracking Improvements @@ -7,10 +7,10 @@ If any part of a Vehicle/Passenger relationship is visible to a player, send all passenger/vehicles to the player in the chain. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 36c9bd418..65cee8cf0 100644 +index d1f07bbbd..945f06c93 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -53,6 +53,7 @@ public abstract class Entity implements ICommandListener { +@@ -53,6 +53,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper protected CraftEntity bukkitEntity; @@ -99,5 +99,5 @@ index 759dacba7..efc4c79ab 100644 } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0126-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0129-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 95% rename from Spigot-Server-Patches/0126-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to Spigot-Server-Patches/0129-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index bcadca8ef6..45046410f4 100644 --- a/Spigot-Server-Patches/0126-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/0129-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,4 +1,4 @@ -From 65ca23df75fa2cb76fcb5bd81019d04fe882701a Mon Sep 17 00:00:00 2001 +From 046d1dbd3f9ea1948d7d1c66e188f5d1f142b382 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 May 2016 23:33:08 -0400 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat @@ -31,5 +31,5 @@ index c9c01fad9..89c8d045b 100644 nbttagcompound.setString("Name", scoreboardteam.getName()); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0127-Do-not-mark-chunks-as-active-for-neighbor-updates.patch b/Spigot-Server-Patches/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch similarity index 94% rename from Spigot-Server-Patches/0127-Do-not-mark-chunks-as-active-for-neighbor-updates.patch rename to Spigot-Server-Patches/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch index 3217c306b7..a10fc9b891 100644 --- a/Spigot-Server-Patches/0127-Do-not-mark-chunks-as-active-for-neighbor-updates.patch +++ b/Spigot-Server-Patches/0130-Do-not-mark-chunks-as-active-for-neighbor-updates.patch @@ -1,4 +1,4 @@ -From d38e09c6e22123caab480c278a119d57883a9d0b Mon Sep 17 00:00:00 2001 +From b61b569f426f29ca36a9b769f868e62d552645ec Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 01:55:17 -0400 Subject: [PATCH] Do not mark chunks as active for neighbor updates @@ -6,10 +6,10 @@ Subject: [PATCH] Do not mark chunks as active for neighbor updates Fixes chunk unload issues diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index ecc76a885..f1bcdef5b 100644 +index 1e78fc625..ba3ee64f8 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -1007,25 +1007,25 @@ public class Chunk { +@@ -1044,25 +1044,25 @@ public class Chunk { // CraftBukkit end world.timings.syncChunkLoadPostTimer.stopTiming(); // Paper world.timings.syncChunkLoadPopulateNeighbors.startTiming(); // Paper @@ -44,5 +44,5 @@ index ecc76a885..f1bcdef5b 100644 if (chunk4 != null) { chunk4.a(chunkgenerator); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0128-Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/0131-Fix-Chunk-Unload-Queue-Issues.patch similarity index 90% rename from Spigot-Server-Patches/0128-Fix-Chunk-Unload-Queue-Issues.patch rename to Spigot-Server-Patches/0131-Fix-Chunk-Unload-Queue-Issues.patch index 4db70d103f..08c390b79d 100644 --- a/Spigot-Server-Patches/0128-Fix-Chunk-Unload-Queue-Issues.patch +++ b/Spigot-Server-Patches/0131-Fix-Chunk-Unload-Queue-Issues.patch @@ -1,4 +1,4 @@ -From 57983d778eae935b45189b8ead413a8617a64067 Mon Sep 17 00:00:00 2001 +From 43debbd620fdfdcda18b02c5826c4b1bfeea5979 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 12 May 2016 02:03:56 -0400 Subject: [PATCH] Fix Chunk Unload Queue Issues @@ -9,10 +9,10 @@ has not resolved all the bugs with the changes. This patch fixes known issues and really should be applied by Spigot team. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index f1bcdef5b..a847aa079 100644 +index ba3ee64f8..857df2937 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -46,7 +46,7 @@ public class Chunk { +@@ -75,7 +75,7 @@ public class Chunk { private long w; private int x; private final ConcurrentLinkedQueue y; @@ -22,7 +22,7 @@ index f1bcdef5b..a847aa079 100644 // Paper start diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 15814f665..c7af8da61 100644 +index 1771a1794..5cc192bbd 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -299,6 +299,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -34,5 +34,5 @@ index 15814f665..c7af8da61 100644 continue; } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0129-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0132-System-property-for-disabling-watchdoge.patch similarity index 89% rename from Spigot-Server-Patches/0129-System-property-for-disabling-watchdoge.patch rename to Spigot-Server-Patches/0132-System-property-for-disabling-watchdoge.patch index 012ca2c534..2b33e2fbe5 100644 --- a/Spigot-Server-Patches/0129-System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/0132-System-property-for-disabling-watchdoge.patch @@ -1,11 +1,11 @@ -From 0eae5e0db2a838536e032e3059d00a4198d60e26 Mon Sep 17 00:00:00 2001 +From 031e6fb04b93ac290d753cf7777fd87830f14e9e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 12 May 2016 23:02:58 -0500 Subject: [PATCH] System property for disabling watchdoge diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 6384d50e7..cb1fcf0f4 100644 +index 0c106ea9c..57a4748a3 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -52,7 +52,7 @@ public class WatchdogThread extends Thread @@ -18,5 +18,5 @@ index 6384d50e7..cb1fcf0f4 100644 Logger log = Bukkit.getServer().getLogger(); log.log( Level.SEVERE, "The server has stopped responding!" ); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0130-Optimize-EAR.patch b/Spigot-Server-Patches/0133-Optimize-EAR.patch similarity index 97% rename from Spigot-Server-Patches/0130-Optimize-EAR.patch rename to Spigot-Server-Patches/0133-Optimize-EAR.patch index 0dce7851b6..d74e6b9565 100644 --- a/Spigot-Server-Patches/0130-Optimize-EAR.patch +++ b/Spigot-Server-Patches/0133-Optimize-EAR.patch @@ -1,4 +1,4 @@ -From 5b42fc0ee3bca8df20a41a7f5bf9815a624ff2f7 Mon Sep 17 00:00:00 2001 +From 12df16929d8bd8779a79431e03c8246128398d59 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Optimize EAR @@ -65,5 +65,5 @@ index 3265a6c25..47865c027 100644 } } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0131-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0134-Optimize-UserCache-Thread-Safe.patch similarity index 98% rename from Spigot-Server-Patches/0131-Optimize-UserCache-Thread-Safe.patch rename to Spigot-Server-Patches/0134-Optimize-UserCache-Thread-Safe.patch index ceaeb913e3..14d7bab5e8 100644 --- a/Spigot-Server-Patches/0131-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0134-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From 24802e2d2a7d5233284330e7dc7267a534289c1c Mon Sep 17 00:00:00 2001 +From 98047b4440fafc8e21ca5562b707725067676c80 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 20:47:41 -0400 Subject: [PATCH] Optimize UserCache / Thread Safe @@ -105,5 +105,5 @@ index 487fc11f1..4fb17a801 100644 } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0132-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0135-Avoid-blocking-on-Network-Manager-creation.patch similarity index 97% rename from Spigot-Server-Patches/0132-Avoid-blocking-on-Network-Manager-creation.patch rename to Spigot-Server-Patches/0135-Avoid-blocking-on-Network-Manager-creation.patch index b55442f485..7fecff9fa0 100644 --- a/Spigot-Server-Patches/0132-Avoid-blocking-on-Network-Manager-creation.patch +++ b/Spigot-Server-Patches/0135-Avoid-blocking-on-Network-Manager-creation.patch @@ -1,4 +1,4 @@ -From fd13f361279b4531c48c427bfb82ea88842f15db Mon Sep 17 00:00:00 2001 +From db6311ce32e96a9747aeb851cde530df2d5c21a4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 23:19:16 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation @@ -43,5 +43,5 @@ index 567edb300..4a629aaa1 100644 if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 ) { -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0133-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch similarity index 94% rename from Spigot-Server-Patches/0133-Optional-TNT-doesn-t-move-in-water.patch rename to Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch index e80c77e910..5894f482eb 100644 --- a/Spigot-Server-Patches/0133-Optional-TNT-doesn-t-move-in-water.patch +++ b/Spigot-Server-Patches/0136-Optional-TNT-doesn-t-move-in-water.patch @@ -1,4 +1,4 @@ -From a3d2dc0a794ba024bb5b2bddb4cb06ea32ea1403 Mon Sep 17 00:00:00 2001 +From 13aa672d8cfd736c9c7210ce4fc8a2183e8aee00 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional TNT doesn't move in water @@ -32,10 +32,10 @@ index 067cb233e..06acdaaf0 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 65cee8cf0..4f4541a64 100644 +index 945f06c93..cb9ef622c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1114,6 +1114,11 @@ public abstract class Entity implements ICommandListener { +@@ -1114,6 +1114,11 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } public boolean aq() { @@ -47,7 +47,7 @@ index 65cee8cf0..4f4541a64 100644 if (this.bJ() instanceof EntityBoat) { this.inWater = false; } else if (this.world.a(this.getBoundingBox().grow(0.0D, -0.4000000059604645D, 0.0D).shrink(0.001D), Material.WATER, this)) { -@@ -2543,6 +2548,11 @@ public abstract class Entity implements ICommandListener { +@@ -2562,6 +2567,11 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } public boolean bo() { @@ -114,5 +114,5 @@ index bb0904f86..50811852a 100644 + // Paper end } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0134-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0137-Faster-redstone-torch-rapid-clock-removal.patch similarity index 96% rename from Spigot-Server-Patches/0134-Faster-redstone-torch-rapid-clock-removal.patch rename to Spigot-Server-Patches/0137-Faster-redstone-torch-rapid-clock-removal.patch index 6f2c94eb70..eaa9f88699 100644 --- a/Spigot-Server-Patches/0134-Faster-redstone-torch-rapid-clock-removal.patch +++ b/Spigot-Server-Patches/0137-Faster-redstone-torch-rapid-clock-removal.patch @@ -1,4 +1,4 @@ -From 0721e7d031b98d56a0271d84de6e6dcddc6eaef8 Mon Sep 17 00:00:00 2001 +From 892b93e90757a501afa2715e83dcc8ecdd626cd5 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Mon, 23 May 2016 12:12:37 +0200 Subject: [PATCH] Faster redstone torch rapid clock removal @@ -39,5 +39,5 @@ index 5b0028a78..429f26ed5 100644 public RedstoneUpdateInfo(BlockPosition blockposition, long i) { this.a = blockposition; -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0135-Ensure-Chunks-never-ever-load-async.patch b/Spigot-Server-Patches/0138-Ensure-Chunks-never-ever-load-async.patch similarity index 97% rename from Spigot-Server-Patches/0135-Ensure-Chunks-never-ever-load-async.patch rename to Spigot-Server-Patches/0138-Ensure-Chunks-never-ever-load-async.patch index 323193270b..36dab276bf 100644 --- a/Spigot-Server-Patches/0135-Ensure-Chunks-never-ever-load-async.patch +++ b/Spigot-Server-Patches/0138-Ensure-Chunks-never-ever-load-async.patch @@ -1,4 +1,4 @@ -From 48b70d5e4a6b5cc7470d2bd282eaa54cae5c4af6 Mon Sep 17 00:00:00 2001 +From 5cdfaa0f565fc0d8893a906291c4501a2a8149a6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 27 May 2016 21:41:26 -0400 Subject: [PATCH] Ensure Chunks never ever load async @@ -42,5 +42,5 @@ index b5efb9c3f..ef9529add 100644 return; } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0136-Add-server-name-parameter.patch b/Spigot-Server-Patches/0139-Add-server-name-parameter.patch similarity index 89% rename from Spigot-Server-Patches/0136-Add-server-name-parameter.patch rename to Spigot-Server-Patches/0139-Add-server-name-parameter.patch index 02bbf59888..529bcd22b3 100644 --- a/Spigot-Server-Patches/0136-Add-server-name-parameter.patch +++ b/Spigot-Server-Patches/0139-Add-server-name-parameter.patch @@ -1,11 +1,11 @@ -From 7c7a7574d99c36e181f1041526437d2b1ec901af Mon Sep 17 00:00:00 2001 +From 71c1c688661b7c21b77d689b8550105d570f49ba Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Sat, 28 May 2016 16:54:03 +0200 Subject: [PATCH] Add server-name parameter diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index e3667e558..ec9508e90 100644 +index f95da9e26..d565a720f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -134,6 +134,14 @@ public class Main { @@ -24,5 +24,5 @@ index e3667e558..ec9508e90 100644 }; -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0137-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0140-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch similarity index 97% rename from Spigot-Server-Patches/0137-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch rename to Spigot-Server-Patches/0140-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index 82556d497f..5915d34ceb 100644 --- a/Spigot-Server-Patches/0137-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/Spigot-Server-Patches/0140-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From 6cdb3095b6aa1b2ba0eb5d591db550f2b784db99 Mon Sep 17 00:00:00 2001 +From 123b1e86e327f1cd628aaa8e9110b27b2147b3a5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 May 2016 22:53:50 -0400 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world @@ -44,5 +44,5 @@ index 97cf75b9f..967852605 100644 double deltaZ = this.locZ - player.locZ; double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0138-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0141-Fix-FallingBlocks-being-stuck-on-fences.patch similarity index 98% rename from Spigot-Server-Patches/0138-Fix-FallingBlocks-being-stuck-on-fences.patch rename to Spigot-Server-Patches/0141-Fix-FallingBlocks-being-stuck-on-fences.patch index 3b38aeef99..dc5af96913 100644 --- a/Spigot-Server-Patches/0138-Fix-FallingBlocks-being-stuck-on-fences.patch +++ b/Spigot-Server-Patches/0141-Fix-FallingBlocks-being-stuck-on-fences.patch @@ -1,4 +1,4 @@ -From d9a0d6e2fcf3e9ecfcf88e72efcbba07e55359da Mon Sep 17 00:00:00 2001 +From f9b319d2f07b629d7f0ffc68dc21d8226366fb58 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Fri, 3 Jun 2016 23:13:39 +0200 Subject: [PATCH] Fix FallingBlocks being stuck on fences @@ -101,5 +101,5 @@ index abdc2dea9..59acc9088 100644 Block block = this.block.getBlock(); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0139-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0142-Make-entities-look-for-hoppers.patch similarity index 99% rename from Spigot-Server-Patches/0139-Make-entities-look-for-hoppers.patch rename to Spigot-Server-Patches/0142-Make-entities-look-for-hoppers.patch index 7b3b2f015c..0670abef06 100644 --- a/Spigot-Server-Patches/0139-Make-entities-look-for-hoppers.patch +++ b/Spigot-Server-Patches/0142-Make-entities-look-for-hoppers.patch @@ -1,4 +1,4 @@ -From 1cbfa6cbaddedefe15fccdf12c0427b1727ac4dc Mon Sep 17 00:00:00 2001 +From b882250f89918c9a9e256def49d0d5b92d7e8916 Mon Sep 17 00:00:00 2001 From: Techcable Date: Sat, 18 Jun 2016 01:01:37 -0500 Subject: [PATCH] Make entities look for hoppers @@ -133,10 +133,10 @@ index 008ed206d..b3c1f550c 100644 this.b = i; this.c = j; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d46fb1d76..9ab892876 100644 +index cb9ef622c..c675a6e16 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -80,6 +80,19 @@ public abstract class Entity implements ICommandListener { +@@ -80,6 +80,19 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper public double locX; public double locY; public double locZ; @@ -379,5 +379,5 @@ index 985513511..e9315f2d5 100644 if (!list.isEmpty()) { -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 96% rename from Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch index 15fa48e609..c3ecfe335d 100644 --- a/Spigot-Server-Patches/0140-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0143-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From b1794a06ccd794dd501b048241fb45d7d2d5364d Mon Sep 17 00:00:00 2001 +From 6b71f1dfeb183e977699e690bc59fa6e0acae336 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement @@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s wasting cpu cycles on saving/unloading/reloading chunks repeatedly. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ce43e7bb..e35e72e8 100644 +index ce43e7bb7..e35e72e8b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -344,4 +344,18 @@ public class PaperWorldConfig { @@ -40,7 +40,7 @@ index ce43e7bb..e35e72e8 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index a847aa07..8ec26b97 100644 +index 857df2937..cc9c8b2e0 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -30,6 +30,7 @@ public class Chunk { @@ -52,7 +52,7 @@ index a847aa07..8ec26b97 100644 public final int locZ; private boolean m; diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 5cc192bb..47159bff 100644 +index 5cc192bbd..47159bff3 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -315,6 +315,19 @@ public class ChunkProviderServer implements IChunkProvider { @@ -76,7 +76,7 @@ index 5cc192bb..47159bff 100644 this.chunkLoader.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 3d30e183..48a008e0 100644 +index 3d30e1831..48a008e0a 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -32,8 +32,16 @@ public class PlayerChunk { @@ -113,7 +113,7 @@ index 3d30e183..48a008e0 100644 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index ad1d90b5..0b10f168 100644 +index ad1d90b56..0b10f1684 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -487,7 +487,13 @@ public class PlayerChunkMap { @@ -132,7 +132,7 @@ index ad1d90b5..0b10f168 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bce3fca8..fccfd3dd 100644 +index eca4903ed..36a78daff 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1594,7 +1594,13 @@ public abstract class World implements IBlockAccess { @@ -151,7 +151,7 @@ index bce3fca8..fccfd3dd 100644 this.methodProfiler.a(() -> { return String.valueOf(TileEntity.a(tileentity.getClass())); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 69dc11e2..284dc639 100644 +index 69dc11e2b..284dc6391 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1576,7 +1576,7 @@ public class CraftWorld implements World { @@ -164,7 +164,7 @@ index 69dc11e2..284dc639 100644 } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 47865c02..b79bf70f 100644 +index 47865c027..b79bf70f0 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -283,6 +283,10 @@ public class ActivationRange @@ -179,5 +179,5 @@ index 47865c02..b79bf70f 100644 } } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0144-Toggleable-Elytra-Wall-Damage.patch similarity index 93% rename from Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch rename to Spigot-Server-Patches/0144-Toggleable-Elytra-Wall-Damage.patch index 16966d117c..dd6939ac53 100644 --- a/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch +++ b/Spigot-Server-Patches/0144-Toggleable-Elytra-Wall-Damage.patch @@ -1,4 +1,4 @@ -From 896c321ce8db0590409d3d5b9b9751f5806c8dad Mon Sep 17 00:00:00 2001 +From 516394ea692192adfd455d9671c2bc9427e9c4c0 Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Sat, 18 Jun 2016 23:13:59 -0700 Subject: [PATCH] Toggleable Elytra Wall Damage @@ -7,7 +7,7 @@ Instead of calculating the damage taken from hitting a wall, you can disable it in the config. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e35e72e8..1b9eb7f4 100644 +index e35e72e8b..1b9eb7f45 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -358,4 +358,9 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index e35e72e8..1b9eb7f4 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 4b6bb38a..dda6219a 100644 +index 4b6bb38ae..dda6219a7 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1739,6 +1739,7 @@ public abstract class EntityLiving extends Entity { @@ -41,5 +41,5 @@ index 4b6bb38a..dda6219a 100644 if (this.onGround && !this.world.isClientSide) { if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0142-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0145-Fix-Double-World-Add-issues.patch similarity index 94% rename from Spigot-Server-Patches/0142-Fix-Double-World-Add-issues.patch rename to Spigot-Server-Patches/0145-Fix-Double-World-Add-issues.patch index 3570135f02..de56b49d7c 100644 --- a/Spigot-Server-Patches/0142-Fix-Double-World-Add-issues.patch +++ b/Spigot-Server-Patches/0145-Fix-Double-World-Add-issues.patch @@ -1,4 +1,4 @@ -From 515c84ad14227a87322dafd2b981dfacb68145ee Mon Sep 17 00:00:00 2001 +From 244438affa544cd9fb04141577b56ef2a0b11788 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 21 Jun 2016 22:54:34 -0400 Subject: [PATCH] Fix Double World Add issues @@ -21,7 +21,7 @@ index 12bd558a7..8747d9a45 100644 Iterator iterator = entity.bF().iterator(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bce3fca84..bafa37f64 100644 +index 36a78daff..6e37c4366 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1103,6 +1103,7 @@ public abstract class World implements IBlockAccess { @@ -33,5 +33,5 @@ index bce3fca84..bafa37f64 100644 org.bukkit.event.Cancellable event = null; if (entity instanceof EntityLiving && !(entity instanceof EntityPlayer)) { -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0143-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0146-Fix-Old-Sign-Conversion.patch similarity index 96% rename from Spigot-Server-Patches/0143-Fix-Old-Sign-Conversion.patch rename to Spigot-Server-Patches/0146-Fix-Old-Sign-Conversion.patch index b2156bd005..fe26730674 100644 --- a/Spigot-Server-Patches/0143-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0146-Fix-Old-Sign-Conversion.patch @@ -1,4 +1,4 @@ -From 01f6e54cec4cf6a75c6c2d8c55d701b26709302e Mon Sep 17 00:00:00 2001 +From b9cd2fb5f5d0dd6ef57e7d8b5c550d760e472077 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 17 Jun 2016 20:50:11 -0400 Subject: [PATCH] Fix Old Sign Conversion @@ -34,11 +34,11 @@ index 9f314204b..23da9467e 100644 public Iterator iterator() { diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 65297a761..537e4b155 100644 +index dfdc55583..d3bc13726 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -11,6 +11,7 @@ import org.bukkit.inventory.InventoryHolder; // CraftBukkit - public abstract class TileEntity { + public abstract class TileEntity implements KeyedObject { public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper + boolean isLoadingStructure = false; // Paper @@ -67,5 +67,5 @@ index 77a7b4458..54b719d91 100644 try { this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0144-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0147-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 89% rename from Spigot-Server-Patches/0144-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to Spigot-Server-Patches/0147-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index 96467ba768..0617dceb6c 100644 --- a/Spigot-Server-Patches/0144-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/Spigot-Server-Patches/0147-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -1,11 +1,11 @@ -From 696b29b37a7d9be204f1a60dd22761a23a37c514 Mon Sep 17 00:00:00 2001 +From 0aa3b7dfdf6535beb442e6ef6a6f609e15d4671c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 16 Jul 2016 19:11:17 -0500 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 924dc63a4..07d39d46a 100644 +index 4fb17a801..7ce08eb8b 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -87,7 +87,7 @@ public class UserCache { @@ -18,5 +18,5 @@ index 924dc63a4..07d39d46a 100644 GameProfile gameprofile = new GameProfile(uuid, s); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0145-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0148-More-informative-vehicle-moved-wrongly-message.patch similarity index 90% rename from Spigot-Server-Patches/0145-More-informative-vehicle-moved-wrongly-message.patch rename to Spigot-Server-Patches/0148-More-informative-vehicle-moved-wrongly-message.patch index 0c998a1bbb..3b393c987f 100644 --- a/Spigot-Server-Patches/0145-More-informative-vehicle-moved-wrongly-message.patch +++ b/Spigot-Server-Patches/0148-More-informative-vehicle-moved-wrongly-message.patch @@ -1,11 +1,11 @@ -From 90aefd7cfcae77d4aead8571213f172eacd51e5e Mon Sep 17 00:00:00 2001 +From 7d692b1b168fdc8a7d3d1394bb6d58f59de98053 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Jul 2016 17:58:53 -0500 Subject: [PATCH] More informative vehicle moved wrongly message diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 187e59a08..98cb84409 100644 +index 9eb7b012f..e66584deb 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -357,7 +357,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -18,5 +18,5 @@ index 187e59a08..98cb84409 100644 entity.setLocation(d3, d4, d5, f, f1); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0146-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch similarity index 93% rename from Spigot-Server-Patches/0146-Re-track-players-that-dismount-from-other-players.patch rename to Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch index 35417398a2..2db75c3cd2 100644 --- a/Spigot-Server-Patches/0146-Re-track-players-that-dismount-from-other-players.patch +++ b/Spigot-Server-Patches/0149-Re-track-players-that-dismount-from-other-players.patch @@ -1,4 +1,4 @@ -From 2eb7b75f8bb6dc310bad7d8c8d8113eba19f1eef Mon Sep 17 00:00:00 2001 +From e5dae80584dbf0caa5a09109148f8063a834d834 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 31 Jul 2016 16:33:03 -0500 Subject: [PATCH] Re-track players that dismount from other players @@ -23,5 +23,5 @@ index 4b6976b19..2391adac7 100644 } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0147-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch similarity index 96% rename from Spigot-Server-Patches/0147-Add-setting-for-proxy-online-mode-status.patch rename to Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch index c89c6cb493..0cd1157c56 100644 --- a/Spigot-Server-Patches/0147-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch @@ -1,4 +1,4 @@ -From c6c16b3ec097088127b2957eab7a0ebcd15e7921 Mon Sep 17 00:00:00 2001 +From 75da66ca4a6bd260906024ddab96c665c9231c9d Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 5 Aug 2016 01:03:08 +0200 Subject: [PATCH] Add setting for proxy online mode status @@ -33,7 +33,7 @@ index b943a9b20..8f3b93dc1 100644 } else { String[] astring1 = astring; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bc048f292..c8cb4f226 100644 +index 054ac1b47..d3165763c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1335,7 +1335,8 @@ public final class CraftServer implements Server { @@ -47,5 +47,5 @@ index bc048f292..c8cb4f226 100644 profile = console.getUserCache().getProfile( name ); } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0148-Optimise-BlockStateEnum-hashCode-and-equals.patch b/Spigot-Server-Patches/0151-Optimise-BlockStateEnum-hashCode-and-equals.patch similarity index 97% rename from Spigot-Server-Patches/0148-Optimise-BlockStateEnum-hashCode-and-equals.patch rename to Spigot-Server-Patches/0151-Optimise-BlockStateEnum-hashCode-and-equals.patch index 091ef7b07e..5e8c157137 100644 --- a/Spigot-Server-Patches/0148-Optimise-BlockStateEnum-hashCode-and-equals.patch +++ b/Spigot-Server-Patches/0151-Optimise-BlockStateEnum-hashCode-and-equals.patch @@ -1,4 +1,4 @@ -From 3b529d552d25189d507d8de8f5631281e0542a39 Mon Sep 17 00:00:00 2001 +From a447b4a83b584f8af1b4b6d5fb660a9db06d2179 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 19 Aug 2016 01:52:56 +0100 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals @@ -66,5 +66,5 @@ index 21ac1e066..a241d7d8c 100644 public static & INamable> BlockStateEnum of(String s, Class oclass) { return a(s, oclass, Predicates.alwaysTrue()); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0149-Disable-ticking-of-snow-blocks.patch b/Spigot-Server-Patches/0152-Disable-ticking-of-snow-blocks.patch similarity index 94% rename from Spigot-Server-Patches/0149-Disable-ticking-of-snow-blocks.patch rename to Spigot-Server-Patches/0152-Disable-ticking-of-snow-blocks.patch index 9d034f4e0d..6972b3a8d0 100644 --- a/Spigot-Server-Patches/0149-Disable-ticking-of-snow-blocks.patch +++ b/Spigot-Server-Patches/0152-Disable-ticking-of-snow-blocks.patch @@ -1,4 +1,4 @@ -From 7cdf6159c7563b5463296ce8bbb40c2e6eceb4e3 Mon Sep 17 00:00:00 2001 +From c495d06f61d0f6a57b3a0b008d4f60e937ecff42 Mon Sep 17 00:00:00 2001 From: killme Date: Tue, 30 Aug 2016 16:39:48 +0200 Subject: [PATCH] Disable ticking of snow blocks @@ -34,5 +34,5 @@ index 8123d7295..b6765e5bc 100644 + //Paper end } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0150-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0153-Fix-AIOOBE-in-inventory-handling.patch similarity index 90% rename from Spigot-Server-Patches/0150-Fix-AIOOBE-in-inventory-handling.patch rename to Spigot-Server-Patches/0153-Fix-AIOOBE-in-inventory-handling.patch index 8af876d030..24f979e481 100644 --- a/Spigot-Server-Patches/0150-Fix-AIOOBE-in-inventory-handling.patch +++ b/Spigot-Server-Patches/0153-Fix-AIOOBE-in-inventory-handling.patch @@ -1,11 +1,11 @@ -From 89ff4cf85bdfee0627ec4a7d5261b83e6984e385 Mon Sep 17 00:00:00 2001 +From ccc20dcc8957311e38f8f1d350e01e9f3ec46d9f Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sun, 4 Sep 2016 16:35:43 -0500 Subject: [PATCH] Fix AIOOBE in inventory handling diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 98cb84409..5e0e5a3c1 100644 +index e66584deb..f5fb86414 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1849,7 +1849,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -18,5 +18,5 @@ index 98cb84409..5e0e5a3c1 100644 } else { Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b()); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0151-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0154-Configurable-packet-in-spam-threshold.patch similarity index 95% rename from Spigot-Server-Patches/0151-Configurable-packet-in-spam-threshold.patch rename to Spigot-Server-Patches/0154-Configurable-packet-in-spam-threshold.patch index 0e337d9b35..cc040a5c85 100644 --- a/Spigot-Server-Patches/0151-Configurable-packet-in-spam-threshold.patch +++ b/Spigot-Server-Patches/0154-Configurable-packet-in-spam-threshold.patch @@ -1,4 +1,4 @@ -From 8a62de01c548f9ec4810c191ba1e238be4b0053c Mon Sep 17 00:00:00 2001 +From fc0280fe1ab9b4a8eff7c35bb03792e00440b736 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 11 Sep 2016 14:30:57 -0500 Subject: [PATCH] Configurable packet in spam threshold @@ -23,7 +23,7 @@ index cf06f8ac3..2001175bf 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5e0e5a3c1..1cdb5bb97 100644 +index f5fb86414..16c343b54 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -909,13 +909,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -44,5 +44,5 @@ index 5e0e5a3c1..1cdb5bb97 100644 limitedPackets = 0; return true; -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0152-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0155-Configurable-flying-kick-messages.patch similarity index 95% rename from Spigot-Server-Patches/0152-Configurable-flying-kick-messages.patch rename to Spigot-Server-Patches/0155-Configurable-flying-kick-messages.patch index d597630d9a..d30851f10a 100644 --- a/Spigot-Server-Patches/0152-Configurable-flying-kick-messages.patch +++ b/Spigot-Server-Patches/0155-Configurable-flying-kick-messages.patch @@ -1,4 +1,4 @@ -From 7468ab306df0d51af8e8341607fca6d89a00a580 Mon Sep 17 00:00:00 2001 +From 4a14ee67890687fcab9c5e662e07a082ea0e0fe6 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 20 Sep 2016 00:58:01 +0000 Subject: [PATCH] Configurable flying kick messages @@ -21,7 +21,7 @@ index 2001175bf..621c585e7 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 1cdb5bb97..0191a9af2 100644 +index 16c343b54..8981e94df 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -144,7 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -43,5 +43,5 @@ index 1cdb5bb97..0191a9af2 100644 } } else { -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0153-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0156-Auto-Save-Improvements.patch similarity index 96% rename from Spigot-Server-Patches/0153-Auto-Save-Improvements.patch rename to Spigot-Server-Patches/0156-Auto-Save-Improvements.patch index c2f065b0b4..a3866f2b8b 100644 --- a/Spigot-Server-Patches/0153-Auto-Save-Improvements.patch +++ b/Spigot-Server-Patches/0156-Auto-Save-Improvements.patch @@ -1,4 +1,4 @@ -From ecdf46882f7290071b36fa9e8c37a85155955cd8 Mon Sep 17 00:00:00 2001 +From 3116c6b8cd13ddce911fcb81a43a7a8b6696bd67 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Sep 2016 23:16:39 -0400 Subject: [PATCH] Auto Save Improvements @@ -12,7 +12,7 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and Adds incremental player auto saving too diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 621c585e..459c86bc 100644 +index 621c585e7..459c86bce 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -251,4 +251,15 @@ public class PaperConfig { @@ -32,7 +32,7 @@ index 621c585e..459c86bc 100644 + } } diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3aa6f89e..f3c0bbde 100644 +index 1b9eb7f45..ce848d63e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -2,6 +2,7 @@ package com.destroystokyo.paper; @@ -64,10 +64,10 @@ index 3aa6f89e..f3c0bbde 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 8ec26b97..87730aec 100644 +index cc9c8b2e0..a59f5b190 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -963,11 +963,9 @@ public class Chunk { +@@ -1000,11 +1000,9 @@ public class Chunk { if (this.t && this.world.getTime() != this.lastSaved || this.s) { return true; } @@ -82,7 +82,7 @@ index 8ec26b97..87730aec 100644 public Random a(long i) { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 47159bff..db81b4a8 100644 +index 47159bff3..db81b4a8c 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -1,5 +1,6 @@ @@ -102,7 +102,7 @@ index 47159bff..db81b4a8 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2391adac..8b7eb47a 100644 +index 2391adac7..8b7eb47a2 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -32,6 +32,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -114,7 +114,7 @@ index 2391adac..8b7eb47a 100644 public final MinecraftServer server; public final PlayerInteractManager playerInteractManager; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ab793307..5c09c6ff 100644 +index ab7933079..5c09c6ff7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -119,6 +119,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -161,7 +161,7 @@ index ab793307..5c09c6ff 100644 this.methodProfiler.a("tallying"); // Spigot start diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 3fc242e4..90f6e2e0 100644 +index 950dbdc50..23ed9efbf 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -343,6 +343,7 @@ public abstract class PlayerList { @@ -200,7 +200,7 @@ index 3fc242e4..90f6e2e0 100644 public void addWhitelist(GameProfile gameprofile) { this.whitelist.add(new WhiteListEntry(gameprofile)); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ebe39711..53cea76e 100644 +index ebe397116..53cea76e2 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1053,8 +1053,9 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -223,5 +223,5 @@ index ebe39711..53cea76e 100644 timings.worldSaveChunks.startTiming(); // Paper chunkproviderserver.a(flag); -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0154-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0157-Chunk-registration-fixes.patch similarity index 89% rename from Spigot-Server-Patches/0154-Chunk-registration-fixes.patch rename to Spigot-Server-Patches/0157-Chunk-registration-fixes.patch index 8b6285f70a..9b90846d88 100644 --- a/Spigot-Server-Patches/0154-Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/0157-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From 2d53913c288c1fa5b130d89ebd836ff56060a699 Mon Sep 17 00:00:00 2001 +From e12d715554fa2684d9c5c7dcfc765fdf66f02654 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 22:54:28 -0400 Subject: [PATCH] Chunk registration fixes @@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr Keep them consistent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3051a3e4..5cd7b22f 100644 +index 6e37c4366..000d2eeb9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1770,7 +1770,7 @@ public abstract class World implements IBlockAccess { @@ -21,5 +21,5 @@ index 3051a3e4..5cd7b22f 100644 if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) { -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0155-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0158-Remove-FishingHook-reference-on-Craft-Entity-removal.patch similarity index 92% rename from Spigot-Server-Patches/0155-Remove-FishingHook-reference-on-Craft-Entity-removal.patch rename to Spigot-Server-Patches/0158-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index 3f1a5fbc48..a93f856a52 100644 --- a/Spigot-Server-Patches/0155-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/Spigot-Server-Patches/0158-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -1,4 +1,4 @@ -From c1b955d692b905a60aad32ba03b5a822f64b3b39 Mon Sep 17 00:00:00 2001 +From 1b510c55f2ced947504bbe7ecd6f5936f9a644f0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 16 Jun 2016 00:17:23 -0400 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal @@ -24,5 +24,5 @@ index d555597dc..f5419dea4 100644 + // Paper end } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0156-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch similarity index 93% rename from Spigot-Server-Patches/0156-Auto-fix-bad-Y-levels-on-player-login.patch rename to Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch index 84f234ac1f..113e0b927f 100644 --- a/Spigot-Server-Patches/0156-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0159-Auto-fix-bad-Y-levels-on-player-login.patch @@ -1,4 +1,4 @@ -From fa08f539cc0615f258c70c4b690093d51d2fa249 Mon Sep 17 00:00:00 2001 +From f181f1048f4dd143fc9f0b998e8e1a789efbf1b2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 23:48:39 -0400 Subject: [PATCH] Auto fix bad Y levels on player login @@ -18,5 +18,5 @@ index 8b7eb47a2..7886eee61 100644 if (this.C_().getForceGamemode()) { this.playerInteractManager.setGameMode(this.C_().getGamemode()); -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0157-Raise-string-limit-for-packet-serialization.patch b/Spigot-Server-Patches/0160-Raise-string-limit-for-packet-serialization.patch similarity index 94% rename from Spigot-Server-Patches/0157-Raise-string-limit-for-packet-serialization.patch rename to Spigot-Server-Patches/0160-Raise-string-limit-for-packet-serialization.patch index 4f82985773..66b93ea883 100644 --- a/Spigot-Server-Patches/0157-Raise-string-limit-for-packet-serialization.patch +++ b/Spigot-Server-Patches/0160-Raise-string-limit-for-packet-serialization.patch @@ -1,4 +1,4 @@ -From 71992d13aa8e1c501cbef940dba3c689298668d0 Mon Sep 17 00:00:00 2001 +From 650f61273af6eb6f665ba0395293aaa4ce1eee97 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 23:54:20 -0400 Subject: [PATCH] Raise string limit for packet serialization @@ -23,5 +23,5 @@ index a8fc7e431..c1273e988 100644 this.d(abyte.length); this.writeBytes(abyte); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0158-Disable-Vanilla-Chunk-GC.patch b/Spigot-Server-Patches/0161-Disable-Vanilla-Chunk-GC.patch similarity index 94% rename from Spigot-Server-Patches/0158-Disable-Vanilla-Chunk-GC.patch rename to Spigot-Server-Patches/0161-Disable-Vanilla-Chunk-GC.patch index 10f3880b17..204648b858 100644 --- a/Spigot-Server-Patches/0158-Disable-Vanilla-Chunk-GC.patch +++ b/Spigot-Server-Patches/0161-Disable-Vanilla-Chunk-GC.patch @@ -1,4 +1,4 @@ -From dfbb19a1b82c4f18849462d12618593aab35b51d Mon Sep 17 00:00:00 2001 +From 839a3b9a54a2c51c8c3333c3a05eef5009561dae Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 26 Sep 2016 01:51:30 -0400 Subject: [PATCH] Disable Vanilla Chunk GC @@ -29,5 +29,5 @@ index 53cea76e2..737ade74d 100644 } } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0159-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0162-Option-to-remove-corrupt-tile-entities.patch similarity index 92% rename from Spigot-Server-Patches/0159-Option-to-remove-corrupt-tile-entities.patch rename to Spigot-Server-Patches/0162-Option-to-remove-corrupt-tile-entities.patch index 559f1f65e6..9621de5a07 100644 --- a/Spigot-Server-Patches/0159-Option-to-remove-corrupt-tile-entities.patch +++ b/Spigot-Server-Patches/0162-Option-to-remove-corrupt-tile-entities.patch @@ -1,4 +1,4 @@ -From 734677730dce1c483404b77ae0d2d9f902dc4f1f Mon Sep 17 00:00:00 2001 +From 5b908630761c4e62419ce38535eaa3b715c34675 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 5 Oct 2016 16:27:36 -0500 Subject: [PATCH] Option to remove corrupt tile entities @@ -19,10 +19,10 @@ index ce848d63e..93b0af036 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 87730aec3..ce76a0e5d 100644 +index a59f5b190..27a36b2b0 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -786,11 +786,18 @@ public class Chunk { +@@ -823,11 +823,18 @@ public class Chunk { "Chunk coordinates: " + (this.locX * 16) + "," + (this.locZ * 16)); e.printStackTrace(); ServerInternalException.reportInternalException(e); @@ -42,5 +42,5 @@ index 87730aec3..ce76a0e5d 100644 if (this.j) { TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition); -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0160-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0163-Add-EntityZapEvent.patch similarity index 98% rename from Spigot-Server-Patches/0160-Add-EntityZapEvent.patch rename to Spigot-Server-Patches/0163-Add-EntityZapEvent.patch index a0d69afab4..8015634732 100644 --- a/Spigot-Server-Patches/0160-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0163-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From fd98d890b21aa6a712c7c215e8926b367c09dab8 Mon Sep 17 00:00:00 2001 +From 13f069785d26dfc9ab4f6f87fb7c7d5c40b1b8c9 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent @@ -67,5 +67,5 @@ index bc84dd30f..ba7e5d181 100644 HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power); horse.getBukkitEntity().getServer().getPluginManager().callEvent(event); -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0161-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0164-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 95% rename from Spigot-Server-Patches/0161-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to Spigot-Server-Patches/0164-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index 4492c923aa..db42f4e118 100644 --- a/Spigot-Server-Patches/0161-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/Spigot-Server-Patches/0164-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -1,4 +1,4 @@ -From 7c2619b6f5b1de30a51cdf42f832501b4a685ce0 Mon Sep 17 00:00:00 2001 +From 3d7dc05a042dca4e664cbabe11769c6b80da55af Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Nov 2016 20:28:12 -0400 Subject: [PATCH] Don't load Chunks from Hoppers and other things @@ -32,5 +32,5 @@ index bc398ec52..90267a1fb 100644 if (block == this) { if (this.e(world, blockposition1)) { -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0162-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0165-Prevent-Auto-Save-if-Save-Queue-is-full.patch similarity index 94% rename from Spigot-Server-Patches/0162-Prevent-Auto-Save-if-Save-Queue-is-full.patch rename to Spigot-Server-Patches/0165-Prevent-Auto-Save-if-Save-Queue-is-full.patch index 1987dae55b..cb1f833927 100644 --- a/Spigot-Server-Patches/0162-Prevent-Auto-Save-if-Save-Queue-is-full.patch +++ b/Spigot-Server-Patches/0165-Prevent-Auto-Save-if-Save-Queue-is-full.patch @@ -1,4 +1,4 @@ -From 86cd32f05d0ffe0aef1cf51619254522e6af51c8 Mon Sep 17 00:00:00 2001 +From 8b4d08357734d240e14b6cef4b3ad9563cbfb822 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Nov 2016 21:52:22 -0400 Subject: [PATCH] Prevent Auto Save if Save Queue is full @@ -7,7 +7,7 @@ If the save queue already has 50 (configurable) of chunks pending, then avoid processing auto save (which would add more) diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f30e36f3..43c38f67 100644 +index 93b0af036..086a7fdaa 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -380,6 +380,11 @@ public class PaperWorldConfig { @@ -23,7 +23,7 @@ index f30e36f3..43c38f67 100644 private void removeCorruptTEs() { removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false); diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index db81b4a8..93e938a9 100644 +index db81b4a8c..93e938a9d 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -254,6 +254,14 @@ public class ChunkProviderServer implements IChunkProvider { @@ -51,7 +51,7 @@ index db81b4a8..93e938a9 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 8747d9a4..77943821 100644 +index 8747d9a45..77943821e 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -39,6 +39,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -64,5 +64,5 @@ index 8747d9a4..77943821 100644 @Nullable public Chunk a(World world, int i, int j) throws IOException { -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0163-Chunk-Save-Stats-Debug-Option.patch b/Spigot-Server-Patches/0166-Chunk-Save-Stats-Debug-Option.patch similarity index 97% rename from Spigot-Server-Patches/0163-Chunk-Save-Stats-Debug-Option.patch rename to Spigot-Server-Patches/0166-Chunk-Save-Stats-Debug-Option.patch index b448b62621..2233274d54 100644 --- a/Spigot-Server-Patches/0163-Chunk-Save-Stats-Debug-Option.patch +++ b/Spigot-Server-Patches/0166-Chunk-Save-Stats-Debug-Option.patch @@ -1,4 +1,4 @@ -From deb93a88dc54ae8e37230bcdd14ba69d941ff82e Mon Sep 17 00:00:00 2001 +From 4c7de2e2109d66a5a3911af98b61c1af58e0d8a6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 4 Nov 2016 02:12:10 -0400 Subject: [PATCH] Chunk Save Stats Debug Option @@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing. Stats on current queue, how many was processed and how many were queued. diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 2b87329f4..73554a518 100644 +index 93e938a9d..66ff1adf6 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -28,6 +28,11 @@ public class ChunkProviderServer implements IChunkProvider { @@ -90,5 +90,5 @@ index 77943821e..14f88e91d 100644 boolean flag; -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0164-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0167-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch similarity index 94% rename from Spigot-Server-Patches/0164-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch rename to Spigot-Server-Patches/0167-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index 372b2dd7d0..339f847e84 100644 --- a/Spigot-Server-Patches/0164-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/Spigot-Server-Patches/0167-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -1,11 +1,11 @@ -From 216cb32c9cb104f0f5c4f089381afd5009154f53 Mon Sep 17 00:00:00 2001 +From 051ae98e08452cc8838801081b84366dbc42b7f8 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 12 Nov 2016 23:25:22 -0600 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 43c38f67..06911639 100644 +index 086a7fdaa..4b9bf3b4f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -3,6 +3,7 @@ package com.destroystokyo.paper; @@ -30,7 +30,7 @@ index 43c38f67..06911639 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 59acc908..d0b67d8f 100644 +index 59acc9088..d0b67d8fd 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -271,6 +271,14 @@ public class EntityFallingBlock extends Entity { @@ -49,7 +49,7 @@ index 59acc908..d0b67d8f 100644 Block block = this.block.getBlock(); diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java -index b24f7d8b..5a08f6b4 100644 +index b24f7d8b2..5a08f6b4e 100644 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java @@ -102,7 +102,14 @@ public class ItemMonsterEgg extends Item { @@ -69,5 +69,5 @@ index b24f7d8b..5a08f6b4 100644 entity.f(nbttagcompound1); } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0165-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0168-Cache-user-authenticator-threads.patch similarity index 97% rename from Spigot-Server-Patches/0165-Cache-user-authenticator-threads.patch rename to Spigot-Server-Patches/0168-Cache-user-authenticator-threads.patch index 00480a2a88..41386948d9 100644 --- a/Spigot-Server-Patches/0165-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0168-Cache-user-authenticator-threads.patch @@ -1,4 +1,4 @@ -From ce75a88cf3b22175b325c446a64511201a3e655e Mon Sep 17 00:00:00 2001 +From 9f3a20649274a2ecc29be930cb9257172ce21902 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 08:31:45 -0500 Subject: [PATCH] Cache user authenticator threads @@ -63,5 +63,5 @@ index 57f728567..2158fcd32 100644 } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0166-Optimize-Network-Queue.patch b/Spigot-Server-Patches/0169-Optimize-Network-Queue.patch similarity index 93% rename from Spigot-Server-Patches/0166-Optimize-Network-Queue.patch rename to Spigot-Server-Patches/0169-Optimize-Network-Queue.patch index 51319514dc..eaabd86f59 100644 --- a/Spigot-Server-Patches/0166-Optimize-Network-Queue.patch +++ b/Spigot-Server-Patches/0169-Optimize-Network-Queue.patch @@ -1,4 +1,4 @@ -From fd37f4274286d7803935867537a4dd26f0859c25 Mon Sep 17 00:00:00 2001 +From d3c90cc09b0a21f0ff27b57d39cff7634386b55f Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 12:54:56 -0500 Subject: [PATCH] Optimize Network Queue @@ -18,5 +18,5 @@ index 5c09c6ff7..13c6b5ccd 100644 private long ab = aw(); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0167-Optimise-removeQueue.patch b/Spigot-Server-Patches/0170-Optimise-removeQueue.patch similarity index 97% rename from Spigot-Server-Patches/0167-Optimise-removeQueue.patch rename to Spigot-Server-Patches/0170-Optimise-removeQueue.patch index 2f3a29306b..d4e629a01a 100644 --- a/Spigot-Server-Patches/0167-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0170-Optimise-removeQueue.patch @@ -1,4 +1,4 @@ -From d5b5ce5c7d017213e228a001c11275ad58ca2fa7 Mon Sep 17 00:00:00 2001 +From 620aaee71fea323a42cfb6674a33a1b715c03a99 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 13:22:40 +0000 Subject: [PATCH] Optimise removeQueue @@ -61,5 +61,5 @@ index 7886eee61..f8e289475 100644 this.cv = entityplayer.cv; this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft()); -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0168-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch similarity index 92% rename from Spigot-Server-Patches/0168-Allow-Reloading-of-Command-Aliases.patch rename to Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch index 6c8975dff6..0ec4091826 100644 --- a/Spigot-Server-Patches/0168-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From 94f0fb32132cd32cac475ba9205a1079d7204385 Mon Sep 17 00:00:00 2001 +From bd9e06a79e32b2c983c41827e7c4127c3436f6cc Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:21:52 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c8cb4f226..701c90679 100644 +index d3165763c..41357cb0e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1889,5 +1889,24 @@ public final class CraftServer implements Server { @@ -35,5 +35,5 @@ index c8cb4f226..701c90679 100644 // Paper end } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0169-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0172-Add-source-to-PlayerExpChangeEvent.patch similarity index 97% rename from Spigot-Server-Patches/0169-Add-source-to-PlayerExpChangeEvent.patch rename to Spigot-Server-Patches/0172-Add-source-to-PlayerExpChangeEvent.patch index 3daa7598d7..a63d675267 100644 --- a/Spigot-Server-Patches/0169-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0172-Add-source-to-PlayerExpChangeEvent.patch @@ -1,4 +1,4 @@ -From 1bbb6e7feeb81380b73a6604886e69208a07a830 Mon Sep 17 00:00:00 2001 +From a5060ec7126dd0c5ea6396bffc5a17ca54ba650b Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:48:33 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent @@ -48,5 +48,5 @@ index ba7e5d181..87b4e9189 100644 Block block = world.getWorld().getBlockAt(x, y, z); CraftBlockState state = (CraftBlockState) block.getState(); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0170-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0173-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 88% rename from Spigot-Server-Patches/0170-Optimize-World.isLoaded-BlockPosition-Z.patch rename to Spigot-Server-Patches/0173-Optimize-World.isLoaded-BlockPosition-Z.patch index 41c66ff0da..9df0319e4a 100644 --- a/Spigot-Server-Patches/0170-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0173-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -1,4 +1,4 @@ -From e1e4c2ad53114d29bce81ddbdc6d74647e97300d Mon Sep 17 00:00:00 2001 +From 1ae942442cdb03e6bc32f33adafa4b0ab464e99f Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Dec 2016 00:11:43 -0500 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z Reduce method invocations for World.isLoaded(BlockPosition)Z diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d5e338eb3..ea6f46522 100644 +index 000d2eeb9..d7bf8378e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -290,7 +290,7 @@ public abstract class World implements IBlockAccess { @@ -19,5 +19,5 @@ index d5e338eb3..ea6f46522 100644 public boolean a(BlockPosition blockposition, boolean flag) { -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0171-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0174-Speedup-BlockPos-by-fixing-inlining.patch similarity index 99% rename from Spigot-Server-Patches/0171-Speedup-BlockPos-by-fixing-inlining.patch rename to Spigot-Server-Patches/0174-Speedup-BlockPos-by-fixing-inlining.patch index b5f48344ac..82925800bb 100644 --- a/Spigot-Server-Patches/0171-Speedup-BlockPos-by-fixing-inlining.patch +++ b/Spigot-Server-Patches/0174-Speedup-BlockPos-by-fixing-inlining.patch @@ -1,4 +1,4 @@ -From 329e237f6cfee08bd844148fd37f97e3f18841de Mon Sep 17 00:00:00 2001 +From 3492554953e265e90b7507d8085b7ee78ab418fc Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 30 Nov 2016 20:56:58 -0600 Subject: [PATCH] Speedup BlockPos by fixing inlining @@ -177,5 +177,5 @@ index b3c1f550c..6a0b3a62d 100644 public BlockPosition h() { -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0172-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0175-Don-t-let-fishinghooks-use-portals.patch similarity index 90% rename from Spigot-Server-Patches/0172-Don-t-let-fishinghooks-use-portals.patch rename to Spigot-Server-Patches/0175-Don-t-let-fishinghooks-use-portals.patch index caff8f970a..1a36277973 100644 --- a/Spigot-Server-Patches/0172-Don-t-let-fishinghooks-use-portals.patch +++ b/Spigot-Server-Patches/0175-Don-t-let-fishinghooks-use-portals.patch @@ -1,14 +1,14 @@ -From 1726ebda78e46c2ede197089ad6a10a487642f65 Mon Sep 17 00:00:00 2001 +From 5f57f26f976b45cda5fcda4dffebc4981d748109 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 16 Dec 2016 16:03:19 -0600 Subject: [PATCH] Don't let fishinghooks use portals diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9ab892876..42da707ae 100644 +index c675a6e16..f71528b5f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -144,7 +144,7 @@ public abstract class Entity implements ICommandListener { +@@ -144,7 +144,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper public boolean ah; public boolean impulse; public int portalCooldown; @@ -35,5 +35,5 @@ index 339d1f1b1..7f011aef8 100644 } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0173-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0176-Add-ProjectileCollideEvent.patch similarity index 98% rename from Spigot-Server-Patches/0173-Add-ProjectileCollideEvent.patch rename to Spigot-Server-Patches/0176-Add-ProjectileCollideEvent.patch index 8545d4a3d1..50becc730b 100644 --- a/Spigot-Server-Patches/0173-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0176-Add-ProjectileCollideEvent.patch @@ -1,11 +1,11 @@ -From afa5992d7e4b22cede2d0fea2fd2b3c85e46121a Mon Sep 17 00:00:00 2001 +From 14204e807bf59765b9126dceee7a62469db61a16 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index f55eb654b..1338f37f3 100644 +index 86836a5d0..8a9e16ad6 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -190,6 +190,15 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -107,5 +107,5 @@ index 87b4e9189..06a277b3b 100644 Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0174-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0177-Vanished-players-don-t-have-rights.patch similarity index 95% rename from Spigot-Server-Patches/0174-Vanished-players-don-t-have-rights.patch rename to Spigot-Server-Patches/0177-Vanished-players-don-t-have-rights.patch index d6039fed98..b886675d17 100644 --- a/Spigot-Server-Patches/0174-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0177-Vanished-players-don-t-have-rights.patch @@ -1,14 +1,14 @@ -From ea9430baff2cace9b95082903fe4dae68eb5a139 Mon Sep 17 00:00:00 2001 +From 570c45e9491173c215cae1bd4ff5ff9b9b8b1fa0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 16 Dec 2016 22:10:35 -0600 Subject: [PATCH] Vanished players don't have rights diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4341a947..6dab8940 100644 +index f71528b5f..b13830e87 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener { +@@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper private static double f = 1.0D; private static int entityCount; private int id; @@ -18,7 +18,7 @@ index 4341a947..6dab8940 100644 protected int j; private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java -index 60149c1c..a5730d1c 100644 +index 60149c1ca..a5730d1c7 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -20,7 +20,7 @@ public class ItemBlock extends Item { @@ -31,7 +31,7 @@ index 60149c1c..a5730d1c 100644 IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 51ab06f9..5925fd96 100644 +index d7bf8378e..424b956e8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1805,6 +1805,33 @@ public abstract class World implements IBlockAccess { @@ -78,7 +78,7 @@ index 51ab06f9..5925fd96 100644 this.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 06a277b3..5f816e44 100644 +index 06a277b3b..5f816e44f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -810,6 +810,13 @@ public class CraftEventFactory { @@ -96,5 +96,5 @@ index 06a277b3..5f816e44 100644 return event; } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0175-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0178-Prevent-Pathfinding-out-of-World-Border.patch similarity index 96% rename from Spigot-Server-Patches/0175-Prevent-Pathfinding-out-of-World-Border.patch rename to Spigot-Server-Patches/0178-Prevent-Pathfinding-out-of-World-Border.patch index cf4cd6c64c..b507bc7b09 100644 --- a/Spigot-Server-Patches/0175-Prevent-Pathfinding-out-of-World-Border.patch +++ b/Spigot-Server-Patches/0178-Prevent-Pathfinding-out-of-World-Border.patch @@ -1,4 +1,4 @@ -From f97ce877b21aaf45ddfed74d21060dd6f4f336fe Mon Sep 17 00:00:00 2001 +From 6aa8b24934a87152a920c31909f7e63199336589 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Dec 2016 23:07:42 -0500 Subject: [PATCH] Prevent Pathfinding out of World Border @@ -39,5 +39,5 @@ index 9038d52eb..632eb1c9d 100644 } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0176-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0179-Bound-Treasure-Maps-to-World-Border.patch similarity index 97% rename from Spigot-Server-Patches/0176-Bound-Treasure-Maps-to-World-Border.patch rename to Spigot-Server-Patches/0179-Bound-Treasure-Maps-to-World-Border.patch index c711f3d9cc..fd701ea42b 100644 --- a/Spigot-Server-Patches/0176-Bound-Treasure-Maps-to-World-Border.patch +++ b/Spigot-Server-Patches/0179-Bound-Treasure-Maps-to-World-Border.patch @@ -1,4 +1,4 @@ -From 2f440bf63710923c4cbacde09832ca021402616b Mon Sep 17 00:00:00 2001 +From 9140c809a2ab87aaccef774be18f66a6e83113d2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:15:11 -0500 Subject: [PATCH] Bound Treasure Maps to World Border @@ -48,5 +48,5 @@ index 632eb1c9d..1bb172bbf 100644 return (double) chunkcoordintpair.e() > this.b() && (double) chunkcoordintpair.c() < this.d() && (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e(); } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0180-Configurable-Cartographer-Treasure-Maps.patch similarity index 94% rename from Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch rename to Spigot-Server-Patches/0180-Configurable-Cartographer-Treasure-Maps.patch index 38bb1bdfcc..24cace5bc6 100644 --- a/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0180-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From 213b2bd7224e1b58693a49a2ba5fc21be5ebe9e7 Mon Sep 17 00:00:00 2001 +From 0a8b200ed814c2a3f9b5758defb1ea16ed685839 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps @@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's which are limited in quantity. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 06911639..50dc50a7 100644 +index 4b9bf3b4f..2ba3bcb8e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -398,4 +398,14 @@ public class PaperWorldConfig { @@ -28,7 +28,7 @@ index 06911639..50dc50a7 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 9d201b14..57fcc3c0 100644 +index 9d201b14e..57fcc3c05 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -783,7 +783,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { @@ -42,5 +42,5 @@ index 9d201b14..57fcc3c0 100644 if (blockposition != null) { ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true); -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0178-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0181-Optimize-ItemStack.isEmpty.patch similarity index 95% rename from Spigot-Server-Patches/0178-Optimize-ItemStack.isEmpty.patch rename to Spigot-Server-Patches/0181-Optimize-ItemStack.isEmpty.patch index 089ada48a1..46c1a262b4 100644 --- a/Spigot-Server-Patches/0178-Optimize-ItemStack.isEmpty.patch +++ b/Spigot-Server-Patches/0181-Optimize-ItemStack.isEmpty.patch @@ -1,4 +1,4 @@ -From b70ebdb4c08ced933b85774c1a3a4955a976059a Mon Sep 17 00:00:00 2001 +From a1b931dcc9fc5937954696bacf2349dcc5b9d57a Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Dec 2016 03:48:29 -0500 Subject: [PATCH] Optimize ItemStack.isEmpty() diff --git a/Spigot-Server-Patches/0179-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0182-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 92% rename from Spigot-Server-Patches/0179-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to Spigot-Server-Patches/0182-Add-API-methods-to-control-if-armour-stands-can-move.patch index 06ae829cb2..2550cee9ac 100644 --- a/Spigot-Server-Patches/0179-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0182-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From 5dfd9332ae1e106d0216583a14e3e2c0302fb10e Mon Sep 17 00:00:00 2001 +From 1a10e756e4f3d5cf2ff493fe92f97d14f86f8c17 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index c9054fc9..ee3d37a7 100644 +index c9054fc91..ee3d37a71 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving { @@ -31,7 +31,7 @@ index c9054fc9..ee3d37a7 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 2b66a08a..8a06cb16 100644 +index 2b66a08ad..8a06cb165 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -211,4 +211,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { @@ -50,5 +50,5 @@ index 2b66a08a..8a06cb16 100644 + } } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0180-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 91% rename from Spigot-Server-Patches/0180-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to Spigot-Server-Patches/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index 50affe3399..c127bbc613 100644 --- a/Spigot-Server-Patches/0180-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0183-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,11 +1,11 @@ -From 81dfa8e18a2f12690a57200bb26ef7b4f11273fe Mon Sep 17 00:00:00 2001 +From a3aaaa3233ac457ef6bc4c1373429c28bc66524a Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:52:04 -0600 Subject: [PATCH] Option to prevent armor stands from doing entity lookups diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 50dc50a7..f65a3fe8 100644 +index 2ba3bcb8e..5f06d4e5e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -408,4 +408,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 50dc50a7..f65a3fe8 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5925fd96..07ecded6 100644 +index 424b956e8..b85c55168 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1335,6 +1335,7 @@ public abstract class World implements IBlockAccess { @@ -31,5 +31,5 @@ index 5925fd96..07ecded6 100644 for (int i = 0; i < list.size(); ++i) { -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0181-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0184-Add-option-to-remove-invalid-statistics.patch similarity index 97% rename from Spigot-Server-Patches/0181-Add-option-to-remove-invalid-statistics.patch rename to Spigot-Server-Patches/0184-Add-option-to-remove-invalid-statistics.patch index 7bd1828e37..92d663c835 100644 --- a/Spigot-Server-Patches/0181-Add-option-to-remove-invalid-statistics.patch +++ b/Spigot-Server-Patches/0184-Add-option-to-remove-invalid-statistics.patch @@ -1,4 +1,4 @@ -From eb0e0d138fb18e6ecb794916ee2a251cd0a63fb9 Mon Sep 17 00:00:00 2001 +From aca58cb4ceffa038818092885a94f1d5ba41b5ca Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 20 Dec 2016 23:09:21 -0600 Subject: [PATCH] Add option to remove invalid statistics @@ -53,5 +53,5 @@ index 14af226f3..e3d2c0ff7 100644 } } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0182-IllegalPacketEvent.patch b/Spigot-Server-Patches/0185-IllegalPacketEvent.patch similarity index 97% rename from Spigot-Server-Patches/0182-IllegalPacketEvent.patch rename to Spigot-Server-Patches/0185-IllegalPacketEvent.patch index b8b0e6f1cd..383b4546f5 100644 --- a/Spigot-Server-Patches/0182-IllegalPacketEvent.patch +++ b/Spigot-Server-Patches/0185-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From d515cb2947636628e6f0f272a72a73fc0d03b5c5 Mon Sep 17 00:00:00 2001 +From 11fb409ed96f90b7f93a5787b364cefb98e34c74 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 23 Jun 2016 23:33:57 -0400 Subject: [PATCH] IllegalPacketEvent @@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent Fired for invalid data from players that represents hacking attempts diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0191a9af2..45a50602b 100644 +index 8981e94df..40ab98f07 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -68,5 +68,5 @@ index 0191a9af2..45a50602b 100644 } // CraftBukkit start -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0183-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch similarity index 95% rename from Spigot-Server-Patches/0183-Properly-fix-item-duplication-bug.patch rename to Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch index 391e7463cb..fbc151a848 100644 --- a/Spigot-Server-Patches/0183-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0186-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From 8581be0d94656eec014608e0149b2a7766c61ea3 Mon Sep 17 00:00:00 2001 +From 7bbc777eb1dd1defd7e779522f05e9095753276e Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug @@ -31,5 +31,5 @@ index 40ab98f07..4f8865d61 100644 } } -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0184-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0187-String-based-Action-Bar-API.patch similarity index 97% rename from Spigot-Server-Patches/0184-String-based-Action-Bar-API.patch rename to Spigot-Server-Patches/0187-String-based-Action-Bar-API.patch index e3b9017d34..38be1e3174 100644 --- a/Spigot-Server-Patches/0184-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0187-String-based-Action-Bar-API.patch @@ -1,4 +1,4 @@ -From c508818bba262f715b0e95376b03d60b497939c2 Mon Sep 17 00:00:00 2001 +From 4c172f93ecc6a820530393ef7551192a1d68f55f Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 15:02:42 -0500 Subject: [PATCH] String based Action Bar API @@ -85,5 +85,5 @@ index 98e9da59a..a9186b77a 100644 public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) { PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(); -- -2.16.2 +2.18.0 diff --git a/Spigot-Server-Patches/0185-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0188-Activation-Range-Improvements.patch similarity index 91% rename from Spigot-Server-Patches/0185-Activation-Range-Improvements.patch rename to Spigot-Server-Patches/0188-Activation-Range-Improvements.patch index 7b61c30a4d..93898fb291 100644 --- a/Spigot-Server-Patches/0185-Activation-Range-Improvements.patch +++ b/Spigot-Server-Patches/0188-Activation-Range-Improvements.patch @@ -1,4 +1,4 @@ -From a55ca73274add9eb9693ca1952c8e563341902f9 Mon Sep 17 00:00:00 2001 +From 68fbc7785fd609e258aa6084639d6206a3cef286 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 22:38:06 -0500 Subject: [PATCH] Activation Range Improvements @@ -18,7 +18,7 @@ index 0c82c6f5b..9659a45ef 100644 private float b; private final float c; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f76be4da0..3cd37f28d 100644 +index dda6219a7..9e864864d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -73,7 +73,7 @@ public abstract class EntityLiving extends Entity { @@ -96,7 +96,7 @@ index e5b5e9887..e3781f3a8 100644 } } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 47865c027..b08564618 100644 +index b79bf70f0..b1536e1c5 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -20,6 +20,7 @@ import net.minecraft.server.EntityFireball; @@ -140,6 +140,15 @@ index 47865c027..b08564618 100644 if ( entity instanceof EntityAnimal ) { EntityAnimal animal = (EntityAnimal) entity; +@@ -278,7 +290,7 @@ public class ActivationRange + int x = MathHelper.floor( entity.locX ); + int z = MathHelper.floor( entity.locZ ); + // Make sure not on edge of unloaded chunk +- Chunk chunk = entity.world.getChunkIfLoaded( x >> 4, z >> 4 ); ++ Chunk chunk = entity.getCurrentChunk(); // Paper + if ( isActive && !( chunk != null && chunk.areNeighborsLoaded( 1 ) ) ) + { + isActive = false; -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0186-Firework-API-s.patch b/Spigot-Server-Patches/0189-Firework-API-s.patch similarity index 98% rename from Spigot-Server-Patches/0186-Firework-API-s.patch rename to Spigot-Server-Patches/0189-Firework-API-s.patch index 8c4fcfc79d..23f2186578 100644 --- a/Spigot-Server-Patches/0186-Firework-API-s.patch +++ b/Spigot-Server-Patches/0189-Firework-API-s.patch @@ -1,4 +1,4 @@ -From 9dacf738239c564182dad1fcd99b6bd43cf38c61 Mon Sep 17 00:00:00 2001 +From 0596e4e92bdc6e00405b6a5604e55110229e5716 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 01:18:33 -0500 Subject: [PATCH] Firework API's @@ -129,5 +129,5 @@ index 99746b3c2..d4fbe31d6 100644 + // Paper end } -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0187-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0190-PlayerTeleportEndGatewayEvent.patch similarity index 94% rename from Spigot-Server-Patches/0187-PlayerTeleportEndGatewayEvent.patch rename to Spigot-Server-Patches/0190-PlayerTeleportEndGatewayEvent.patch index 1efe41aba0..42d622faaf 100644 --- a/Spigot-Server-Patches/0187-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0190-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 4c4ce708c08803922b2dcaa6b8ae9ce5e3b244eb Mon Sep 17 00:00:00 2001 +From 540ca9ec6094933c35bf034c50e44d1a59a88f07 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 21:44:50 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -19,5 +19,5 @@ index cfce9274a..ecbc48b0c 100644 if (teleEvent.isCancelled()) { return; -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0188-ShulkerBox-Dupe-Prevention.patch b/Spigot-Server-Patches/0191-ShulkerBox-Dupe-Prevention.patch similarity index 93% rename from Spigot-Server-Patches/0188-ShulkerBox-Dupe-Prevention.patch rename to Spigot-Server-Patches/0191-ShulkerBox-Dupe-Prevention.patch index 79447c9aef..eff8804154 100644 --- a/Spigot-Server-Patches/0188-ShulkerBox-Dupe-Prevention.patch +++ b/Spigot-Server-Patches/0191-ShulkerBox-Dupe-Prevention.patch @@ -1,4 +1,4 @@ -From d82dfb8947dd6bb42282a778986d1cfe32c30216 Mon Sep 17 00:00:00 2001 +From ae5bdca8944e22bbd51dd5c3a668844dc10297df Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 2 Jan 2017 16:32:56 -0500 Subject: [PATCH] ShulkerBox Dupe Prevention @@ -19,5 +19,5 @@ index 8811eb3e3..74e2e448f 100644 world.updateAdjacentComparators(blockposition, iblockdata.getBlock()); -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0189-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0192-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 95% rename from Spigot-Server-Patches/0189-Provide-E-TE-Chunk-count-stat-methods.patch rename to Spigot-Server-Patches/0192-Provide-E-TE-Chunk-count-stat-methods.patch index 5efd1e636f..9ce226f78d 100644 --- a/Spigot-Server-Patches/0189-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-Server-Patches/0192-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From 8ed6bbfdcdcdce2c39507c0a4d0e179c76a36f86 Mon Sep 17 00:00:00 2001 +From 8ad93887128df82ddae370b8a6da958cf7b1ff7b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:24:46 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -41,5 +41,5 @@ index 284dc6391..2e78cd8cf 100644 public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0190-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0193-Enforce-Sync-Player-Saves.patch similarity index 90% rename from Spigot-Server-Patches/0190-Enforce-Sync-Player-Saves.patch rename to Spigot-Server-Patches/0193-Enforce-Sync-Player-Saves.patch index 17469b7260..0505d3570f 100644 --- a/Spigot-Server-Patches/0190-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0193-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From eea42d14eaa0cc5e8b3b4bc3716ccf9197044386 Mon Sep 17 00:00:00 2001 +From 747e0616893e74e1c96216c04ab0e4462b675533 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:41:58 -0500 Subject: [PATCH] Enforce Sync Player Saves @@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 90f6e2e04..054483a73 100644 +index 23ed9efbf..c49711cad 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1252,6 +1252,7 @@ public abstract class PlayerList { @@ -27,5 +27,5 @@ index 90f6e2e04..054483a73 100644 // Paper end -- -2.16.3 +2.18.0 diff --git a/Spigot-Server-Patches/0191-Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/0194-Enforce-Sync-Chunk-Unloads.patch similarity index 94% rename from Spigot-Server-Patches/0191-Enforce-Sync-Chunk-Unloads.patch rename to Spigot-Server-Patches/0194-Enforce-Sync-Chunk-Unloads.patch index 551f13e93b..ad9f2264dd 100644 --- a/Spigot-Server-Patches/0191-Enforce-Sync-Chunk-Unloads.patch +++ b/Spigot-Server-Patches/0194-Enforce-Sync-Chunk-Unloads.patch @@ -1,4 +1,4 @@ -From e1c5bbdef8f6afe22c6d095ee8cbfde7b895af45 Mon Sep 17 00:00:00 2001 +From 246c986d5d4681c5ab7fb23a07b8e061d389ce8c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 16:06:44 -0500 Subject: [PATCH] Enforce Sync Chunk Unloads @@ -27,5 +27,5 @@ index 2e78cd8cf..4ffe0d208 100644 public boolean regenerateChunk(int x, int z) { -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0192-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0195-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 77% rename from Spigot-Server-Patches/0192-Don-t-allow-entities-to-ride-themselves-572.patch rename to Spigot-Server-Patches/0195-Don-t-allow-entities-to-ride-themselves-572.patch index 083f2383e8..714caf3d71 100644 --- a/Spigot-Server-Patches/0192-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0195-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,14 +1,14 @@ -From 0a3a33fea101ac2f6421f6e8907895db67cedb42 Mon Sep 17 00:00:00 2001 +From 4ca9bb5d12ac04c752cf8983bc7780c811a32a2e Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Sun, 8 Jan 2017 04:31:36 +0000 Subject: [PATCH] Don't allow entities to ride themselves - #572 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 36914ed9..54605941 100644 +index b13830e87..20324deeb 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1937,6 +1937,7 @@ public abstract class Entity implements ICommandListener { +@@ -1956,6 +1956,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } protected void o(Entity entity) { @@ -17,5 +17,5 @@ index 36914ed9..54605941 100644 throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)"); } else { -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0193-Fix-block-break-desync.patch b/Spigot-Server-Patches/0196-Fix-block-break-desync.patch similarity index 88% rename from Spigot-Server-Patches/0193-Fix-block-break-desync.patch rename to Spigot-Server-Patches/0196-Fix-block-break-desync.patch index d3e9e9967a..3e16efaf2f 100644 --- a/Spigot-Server-Patches/0193-Fix-block-break-desync.patch +++ b/Spigot-Server-Patches/0196-Fix-block-break-desync.patch @@ -1,11 +1,11 @@ -From ac16dd9c372c065d244a5354177b150ab6519191 Mon Sep 17 00:00:00 2001 +From 7ce94963f680709a18d9affef31d8e3c643f479e Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 8 Jan 2017 18:50:35 +1100 Subject: [PATCH] Fix block break desync diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 33ae76415..2367ff1f0 100644 +index 4f8865d61..9abc9852f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -868,6 +868,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -17,5 +17,5 @@ index 33ae76415..2367ff1f0 100644 } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) { return; -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0194-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0197-Assign-the-World-in-WorldGenStronghold.patch similarity index 91% rename from Spigot-Server-Patches/0194-Assign-the-World-in-WorldGenStronghold.patch rename to Spigot-Server-Patches/0197-Assign-the-World-in-WorldGenStronghold.patch index 6397d937fd..84286abc84 100644 --- a/Spigot-Server-Patches/0194-Assign-the-World-in-WorldGenStronghold.patch +++ b/Spigot-Server-Patches/0197-Assign-the-World-in-WorldGenStronghold.patch @@ -1,4 +1,4 @@ -From 2f82d8aafd582feb742b94a70af97a109ee7ae34 Mon Sep 17 00:00:00 2001 +From 9d2c2c0c6e0763a163a8a52d4e8323e853c19cb1 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 14 Jan 2017 01:22:07 -0600 Subject: [PATCH] Assign the World in WorldGenStronghold @@ -17,5 +17,5 @@ index c93754704..a3b958e01 100644 this.c(); this.b = true; -- -2.16.1 +2.18.0 diff --git a/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0198-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 99% rename from Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to Spigot-Server-Patches/0198-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 4e445c7f5c..53e20b080c 100644 --- a/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0198-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 1e93cb2d271ea70f82389d69c55179ba9a2edca0 Mon Sep 17 00:00:00 2001 +From 6fab4174f4e7fc320a124b1b8d083541b49701fe Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:31:46 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -253,5 +253,5 @@ index 3a09cab3d..3302af0e4 100644 public EntityExperienceOrb getHandle() { return (EntityExperienceOrb) entity; -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0196-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch similarity index 92% rename from Spigot-Server-Patches/0196-Cap-Entity-Collisions.patch rename to Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch index 45a3795af6..7e698f0058 100644 --- a/Spigot-Server-Patches/0196-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 658642250d0d7fadf44d95ff1f41a4d36b69eaa5 Mon Sep 17 00:00:00 2001 +From a30098615015d5b407960dfe74033d7545d7eb12 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped. You can set this to 0 to disable collisions. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f65a3fe8..0ea2a856 100644 +index 5f06d4e5e..29b4bdb47 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -413,4 +413,10 @@ public class PaperWorldConfig { @@ -27,10 +27,10 @@ index f65a3fe8..0ea2a856 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3f1c78af..04bc05d3 100644 +index 20324deeb..b4233df5f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener { +@@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper public final boolean defaultActivationState; public long activatedTick = Integer.MIN_VALUE; public boolean fromMobSpawner; @@ -39,7 +39,7 @@ index 3f1c78af..04bc05d3 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 38c04337..c97ee68a 100644 +index 38c043375..c97ee68a5 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2191,8 +2191,11 @@ public abstract class EntityLiving extends Entity { @@ -56,5 +56,5 @@ index 38c04337..c97ee68a 100644 this.C(entity); } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0197-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch b/Spigot-Server-Patches/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch similarity index 92% rename from Spigot-Server-Patches/0197-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch rename to Spigot-Server-Patches/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch index fcfd2c5274..5d33adcee3 100644 --- a/Spigot-Server-Patches/0197-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch +++ b/Spigot-Server-Patches/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch @@ -1,11 +1,11 @@ -From 394ab9e7cb86fd104b5058737e73b0a476f0f251 Mon Sep 17 00:00:00 2001 +From 7b6363144fa307ab410333b3ad647b10ceb17aa9 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 23 Jan 2017 15:10:25 -0600 Subject: [PATCH] Do not allow a zero max height in BiomeJungle diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java -index 8f67cb36..8dc0b623 100644 +index 8f67cb36c..8dc0b6238 100644 --- a/src/main/java/net/minecraft/server/BiomeJungle.java +++ b/src/main/java/net/minecraft/server/BiomeJungle.java @@ -40,7 +40,11 @@ public class BiomeJungle extends BiomeBase { @@ -22,7 +22,7 @@ index 8f67cb36..8dc0b623 100644 (new WorldGenMelon()).generate(world, random, blockposition.a(i, k, j)); WorldGenVines worldgenvines = new WorldGenVines(); diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 6a0b3a62..38a7af58 100644 +index 6a0b3a62d..38a7af58c 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -42,6 +42,7 @@ public class BlockPosition extends BaseBlockPosition { @@ -34,5 +34,5 @@ index 6a0b3a62..38a7af58 100644 return d0 == 0.0D && d1 == 0.0D && d2 == 0.0D ? this : new BlockPosition((double) this.getX() + d0, (double) this.getY() + d1, (double) this.getZ() + d2); } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0198-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0201-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 97% rename from Spigot-Server-Patches/0198-Remove-CraftScheduler-Async-Task-Debugger.patch rename to Spigot-Server-Patches/0201-Remove-CraftScheduler-Async-Task-Debugger.patch index 9ba48069a7..4f1b21564b 100644 --- a/Spigot-Server-Patches/0198-Remove-CraftScheduler-Async-Task-Debugger.patch +++ b/Spigot-Server-Patches/0201-Remove-CraftScheduler-Async-Task-Debugger.patch @@ -1,4 +1,4 @@ -From 7ab0b381e76b124c13aaaefe3bd1fa04ab3a81f7 Mon Sep 17 00:00:00 2001 +From a962c34610bc172ff3076bf986b38c2c09c29c33 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 00:04:04 -0500 Subject: [PATCH] Remove CraftScheduler Async Task Debugger @@ -58,5 +58,5 @@ index 26753fac5..a2fadaf82 100644 @Deprecated -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0199-Shame-on-you-Mojang.patch b/Spigot-Server-Patches/0202-Shame-on-you-Mojang.patch similarity index 95% rename from Spigot-Server-Patches/0199-Shame-on-you-Mojang.patch rename to Spigot-Server-Patches/0202-Shame-on-you-Mojang.patch index 76144e5333..4cf1c6f40c 100644 --- a/Spigot-Server-Patches/0199-Shame-on-you-Mojang.patch +++ b/Spigot-Server-Patches/0202-Shame-on-you-Mojang.patch @@ -1,4 +1,4 @@ -From 813194e55444cb2fefefe306c24a11d3ac72cc87 Mon Sep 17 00:00:00 2001 +From 0c21e9ed61fa981a86ad099aabfe67586e3900e6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 19:17:28 -0500 Subject: [PATCH] Shame on you Mojang @@ -12,7 +12,7 @@ This then triggers async chunk loads! What in the hell were you thinking? diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java -index f07ac018..21075974 100644 +index f07ac0186..21075974d 100644 --- a/src/main/java/net/minecraft/server/BlockBeacon.java +++ b/src/main/java/net/minecraft/server/BlockBeacon.java @@ -62,8 +62,8 @@ public class BlockBeacon extends BlockTileEntity { @@ -55,5 +55,5 @@ index f07ac018..21075974 100644 } } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0200-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0203-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch similarity index 91% rename from Spigot-Server-Patches/0200-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch rename to Spigot-Server-Patches/0203-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index e863eb34ca..c8156c5a78 100644 --- a/Spigot-Server-Patches/0200-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/Spigot-Server-Patches/0203-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -1,11 +1,11 @@ -From 43c02c779f0499de08651113c1d4cc3228f370fd Mon Sep 17 00:00:00 2001 +From d8a8fcb78cfa437fb01080d88ac256a4dc490140 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 7 Feb 2017 16:55:35 -0600 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 73554a51..2558ba8c 100644 +index 66ff1adf6..de859ffd1 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -325,7 +325,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -18,5 +18,5 @@ index 73554a51..2558ba8c 100644 Iterator iterator = this.unloadQueue.iterator(); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0201-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch similarity index 92% rename from Spigot-Server-Patches/0201-Do-not-let-armorstands-drown.patch rename to Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch index 15dc57541d..b951e8c58e 100644 --- a/Spigot-Server-Patches/0201-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch @@ -1,11 +1,11 @@ -From 31b46597044bfba5497b3f6aab5b21642cad5612 Mon Sep 17 00:00:00 2001 +From d93e6f8c98d66ccad03bb24a8f89c3af11a60422 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 18 Feb 2017 19:29:58 -0600 Subject: [PATCH] Do not let armorstands drown diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index ee3d37a7..df0d66ad 100644 +index ee3d37a71..df0d66ad0 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -779,5 +779,10 @@ public class EntityArmorStand extends EntityLiving { @@ -20,7 +20,7 @@ index ee3d37a7..df0d66ad 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index adb04593..aa4c23a1 100644 +index c97ee68a5..44335fd2d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -195,6 +195,7 @@ public abstract class EntityLiving extends Entity { @@ -41,5 +41,5 @@ index adb04593..aa4c23a1 100644 if (this.getAirTicks() == -20) { this.setAirTicks(0); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0202-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch b/Spigot-Server-Patches/0205-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch similarity index 94% rename from Spigot-Server-Patches/0202-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch rename to Spigot-Server-Patches/0205-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch index 615e42dc96..5a40bb6896 100644 --- a/Spigot-Server-Patches/0202-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch +++ b/Spigot-Server-Patches/0205-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch @@ -1,4 +1,4 @@ -From 27b11fe499c79cd2a1fefa1139f9e17ba852facd Mon Sep 17 00:00:00 2001 +From 070cf38a5cd2ad6ee121d9b8cefff5c0365e62cb Mon Sep 17 00:00:00 2001 From: kashike Date: Sun, 9 Apr 2017 23:50:15 -0700 Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack diff --git a/Spigot-Server-Patches/0203-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0206-Properly-handle-async-calls-to-restart-the-server.patch similarity index 98% rename from Spigot-Server-Patches/0203-Properly-handle-async-calls-to-restart-the-server.patch rename to Spigot-Server-Patches/0206-Properly-handle-async-calls-to-restart-the-server.patch index 9cf8975088..258e3bf5b9 100644 --- a/Spigot-Server-Patches/0203-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0206-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From fa9d2a8159458408c68c6b1b56f12ae0a590e66b Mon Sep 17 00:00:00 2001 +From 46b3f0b41023c5857dd0af9997e4f44570c9bedc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 12 May 2017 23:34:11 -0500 Subject: [PATCH] Properly handle async calls to restart the server @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 13c6b5cc..908a5d27 100644 +index 13c6b5ccd..908a5d273 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -71,6 +71,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -78,7 +78,7 @@ index 13c6b5cc..908a5d27 100644 return this.serverThread; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 054483a7..fbbb4e73 100644 +index c49711cad..85357a003 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1378,10 +1378,15 @@ public abstract class PlayerList { @@ -107,7 +107,7 @@ index 054483a7..fbbb4e73 100644 // CraftBukkit start public void sendMessage(IChatBaseComponent[] iChatBaseComponents) { diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java -index 947c43a5..f15fd9f3 100644 +index 947c43a5d..f15fd9f37 100644 --- a/src/main/java/org/spigotmc/RestartCommand.java +++ b/src/main/java/org/spigotmc/RestartCommand.java @@ -46,88 +46,123 @@ public class RestartCommand extends Command @@ -306,5 +306,5 @@ index 947c43a5..f15fd9f3 100644 } } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0204-Add-system-property-to-disable-book-size-limits.patch b/Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch similarity index 97% rename from Spigot-Server-Patches/0204-Add-system-property-to-disable-book-size-limits.patch rename to Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch index da820183d2..8b5a05cbdd 100644 --- a/Spigot-Server-Patches/0204-Add-system-property-to-disable-book-size-limits.patch +++ b/Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch @@ -1,4 +1,4 @@ -From 6d65fb462e07a362f643770fce990e722470e233 Mon Sep 17 00:00:00 2001 +From bc0d96c47df073207c45a3ced55f99fc1e1b2381 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 13 May 2017 20:11:21 -0500 Subject: [PATCH] Add system property to disable book size limits @@ -57,5 +57,5 @@ index a7e51d9f1..ffdb7ec82 100644 } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0205-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 94% rename from Spigot-Server-Patches/0205-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index 6f6c20a3e7..723e3c7ff2 100644 --- a/Spigot-Server-Patches/0205-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -1,4 +1,4 @@ -From 39278b7a6809d7dbbb8e57ade7deda8e72a1f7fe Mon Sep 17 00:00:00 2001 +From 7833d5e3b594f444405a15f6b3c54c9042e19776 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 16 May 2017 21:29:08 -0500 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement @@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release. To be converted into a Paper-API event at some point in the future? diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0ea2a856..bf6b20f7 100644 +index 29b4bdb47..31aad03c2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -419,4 +419,10 @@ public class PaperWorldConfig { @@ -26,7 +26,7 @@ index 0ea2a856..bf6b20f7 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 0f1d9963..9cda8a17 100644 +index 0f1d99636..9cda8a177 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -399,7 +399,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -39,7 +39,7 @@ index 0f1d9963..9cda8a17 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9abc9852..3104fc0e 100644 +index 9abc9852f..3104fc0ea 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1514,6 +1514,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -57,5 +57,5 @@ index 9abc9852..3104fc0e 100644 case STOP_SNEAKING: -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0206-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 91% rename from Spigot-Server-Patches/0206-Add-configuration-option-to-prevent-player-names-fro.patch rename to Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch index 23b1184e2d..3b7e714118 100644 --- a/Spigot-Server-Patches/0206-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From bc818c7595edb2ea72a1fb84bd4ecfb1a623a92b Mon Sep 17 00:00:00 2001 +From fc82e20fac8adc748ef554d6de4eab73fb2e2a08 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 9 Jun 2017 07:24:34 -0700 Subject: [PATCH] Add configuration option to prevent player names from being @@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ea6fcb39..dbafef02 100644 +index ea6fcb39f..dbafef023 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -271,4 +271,9 @@ public class PaperConfig { @@ -20,7 +20,7 @@ index ea6fcb39..dbafef02 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 41357cb0..27c6cadd 100644 +index 41357cb0e..27c6caddc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1908,5 +1908,10 @@ public final class CraftServer implements Server { @@ -35,5 +35,5 @@ index 41357cb0..27c6cadd 100644 // Paper end } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0207-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 98% rename from Spigot-Server-Patches/0207-Use-TerminalConsoleAppender-for-console-improvements.patch rename to Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch index 121b6b87f4..79764a98a2 100644 --- a/Spigot-Server-Patches/0207-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From 6905ba19f037e423620c378ed7d7a51fa296a40c Mon Sep 17 00:00:00 2001 +From 0140f0a679cb39eb069e0ea08f22775885ee9a16 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -20,7 +20,7 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index 9d273c6d..26775156 100644 +index 9d273c6d9..26775156b 100644 --- a/pom.xml +++ b/pom.xml @@ -53,12 +53,6 @@ @@ -90,7 +90,7 @@ index 9d273c6d..26775156 100644 org.apache.maven.plugins diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java new file mode 100644 -index 00000000..685deaa0 +index 000000000..685deaa0e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java @@ -0,0 +1,17 @@ @@ -113,7 +113,7 @@ index 00000000..685deaa0 +} diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java new file mode 100644 -index 00000000..626bfeec +index 000000000..626bfeec8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalHandler.java @@ -0,0 +1,61 @@ @@ -179,7 +179,7 @@ index 00000000..626bfeec + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 8f2afcc3..b3f1aa99 100644 +index 8f2afcc32..b3f1aa999 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -73,7 +73,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -232,7 +232,7 @@ index 8f2afcc3..b3f1aa99 100644 System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 908a5d27..e8bddc17 100644 +index 908a5d273..e8bddc171 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -42,7 +42,6 @@ import org.apache.commons.lang3.Validate; @@ -291,7 +291,7 @@ index 908a5d27..e8bddc17 100644 public boolean a(int i, String s) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 85357a00..3e512248 100644 +index 85357a003..3e5122486 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -78,8 +78,7 @@ public abstract class PlayerList { @@ -305,7 +305,7 @@ index 85357a00..3e512248 100644 this.k = new GameProfileBanList(PlayerList.a); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 27c6cadd..539f492e 100644 +index 27c6caddc..539f492e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -128,7 +128,6 @@ import io.netty.buffer.ByteBuf; @@ -331,7 +331,7 @@ index 27c6cadd..539f492e 100644 @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d565a720..c9e8a873 100644 +index d565a720f..c9e8a8737 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -14,7 +14,7 @@ import java.util.logging.Logger; @@ -373,7 +373,7 @@ index d565a720..c9e8a873 100644 if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java deleted file mode 100644 -index 26a2fb89..00000000 +index 26a2fb894..000000000 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ /dev/null @@ -1,74 +0,0 @@ @@ -452,7 +452,7 @@ index 26a2fb89..00000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index 33e8ea02..1e3aae3b 100644 +index 33e8ea02c..1e3aae3b8 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -8,17 +8,27 @@ import java.util.logging.Level; @@ -531,7 +531,7 @@ index 33e8ea02..1e3aae3b 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index 984df408..bbb5a84f 100644 +index 984df4083..bbb5a84f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -20,7 +20,7 @@ public class ServerShutdownThread extends Thread { @@ -545,7 +545,7 @@ index 984df408..bbb5a84f 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java deleted file mode 100644 -index b6409711..00000000 +index b64097113..000000000 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java +++ /dev/null @@ -1,54 +0,0 @@ @@ -604,7 +604,7 @@ index b6409711..00000000 - } -} diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 5cee8f00..08b6bb7f 100644 +index 5cee8f00e..08b6bb7f9 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,12 +1,11 @@ diff --git a/Spigot-Server-Patches/0208-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0211-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 92% rename from Spigot-Server-Patches/0208-provide-a-configurable-option-to-disable-creeper-lin.patch rename to Spigot-Server-Patches/0211-provide-a-configurable-option-to-disable-creeper-lin.patch index 2d9f03cfab..b79ed5202a 100644 --- a/Spigot-Server-Patches/0208-provide-a-configurable-option-to-disable-creeper-lin.patch +++ b/Spigot-Server-Patches/0211-provide-a-configurable-option-to-disable-creeper-lin.patch @@ -1,4 +1,4 @@ -From 770db1961ea2c57c7898471c2e5fa5a1fb3e69e6 Mon Sep 17 00:00:00 2001 +From 1450cf36f8663affe1820aada01118156939d236 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Jun 2017 21:01:18 +0100 Subject: [PATCH] provide a configurable option to disable creeper lingering @@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bf6b20f7..601eb08b 100644 +index 31aad03c2..646620d0c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -425,4 +425,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index bf6b20f7..601eb08b 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index c872607f..8098d4d9 100644 +index c872607fc..8098d4d9f 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -222,7 +222,7 @@ public class EntityCreeper extends EntityMonster { @@ -34,5 +34,5 @@ index c872607f..8098d4d9 100644 entityareaeffectcloud.setSource(this); // CraftBukkit -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0209-Item-canEntityPickup.patch b/Spigot-Server-Patches/0212-Item-canEntityPickup.patch similarity index 92% rename from Spigot-Server-Patches/0209-Item-canEntityPickup.patch rename to Spigot-Server-Patches/0212-Item-canEntityPickup.patch index 7c05f76807..f4011cd32d 100644 --- a/Spigot-Server-Patches/0209-Item-canEntityPickup.patch +++ b/Spigot-Server-Patches/0212-Item-canEntityPickup.patch @@ -1,11 +1,11 @@ -From b03021584a918c0fd7ad5ae659da9f53a2ea21dd Mon Sep 17 00:00:00 2001 +From e4e98632b0628b4452d2b266506da9d200a62d4a Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:17 -0500 Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 5ea9f309..89e87836 100644 +index 5ea9f3097..89e878365 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -514,6 +514,12 @@ public abstract class EntityInsentient extends EntityLiving { @@ -22,7 +22,7 @@ index 5ea9f309..89e87836 100644 this.a(entityitem); } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 6593fc63..99dbb139 100644 +index 6593fc633..99dbb1393 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -22,6 +22,7 @@ public class EntityItem extends Entity implements HopperPusher { @@ -34,7 +34,7 @@ index 6593fc63..99dbb139 100644 private String g; private String h; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index a17a537d..1df17f09 100644 +index a17a537d6..1df17f09b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -37,6 +37,16 @@ public class CraftItem extends CraftEntity implements Item { @@ -55,5 +55,5 @@ index a17a537d..1df17f09 100644 public String toString() { return "CraftItem"; -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0210-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0213-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 95% rename from Spigot-Server-Patches/0210-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to Spigot-Server-Patches/0213-PlayerPickupItemEvent-setFlyAtPlayer.patch index 8acaf986bb..0048309140 100644 --- a/Spigot-Server-Patches/0210-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-Server-Patches/0213-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 32dbe9a6e036ce0b9481cd58393dd0f533835ac4 Mon Sep 17 00:00:00 2001 +From e9e0c61c0ea8ce2ae7cbc21c3c2c6b0ea9932237 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:09 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 99dbb139..ae4910b4 100644 +index 99dbb1393..ae4910b4b 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -332,6 +332,7 @@ public class EntityItem extends Entity implements HopperPusher { @@ -44,5 +44,5 @@ index 99dbb139..ae4910b4 100644 this.die(); itemstack.setCount(i); -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0211-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0214-PlayerAttemptPickupItemEvent.patch similarity index 94% rename from Spigot-Server-Patches/0211-PlayerAttemptPickupItemEvent.patch rename to Spigot-Server-Patches/0214-PlayerAttemptPickupItemEvent.patch index 7597230170..838e31ab46 100644 --- a/Spigot-Server-Patches/0211-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-Server-Patches/0214-PlayerAttemptPickupItemEvent.patch @@ -1,11 +1,11 @@ -From 8a9c03adf99ca8e4f43009560601ab56346fd67b Mon Sep 17 00:00:00 2001 +From 45b4de7a63937ed0c9c58960e6be049d11b00a52 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:30 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index ae4910b4..0b7fc327 100644 +index ae4910b4b..0b7fc327f 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -8,6 +8,7 @@ import org.apache.logging.log4j.Logger; @@ -40,5 +40,5 @@ index ae4910b4..0b7fc327 100644 itemstack.setCount(canHold); // Call legacy event -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0212-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch similarity index 93% rename from Spigot-Server-Patches/0212-Add-UnknownCommandEvent.patch rename to Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch index 7b2d443b79..d4d719e842 100644 --- a/Spigot-Server-Patches/0212-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch @@ -1,11 +1,11 @@ -From b8b8a1100adb5e0a6a350c437b0e3f6a7e43f95d Mon Sep 17 00:00:00 2001 +From 8b6a5b555082c1dd6de30aac296317869d9dcec9 Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:21 -0400 Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 539f492e..77c16fe2 100644 +index 539f492e0..77c16fe2c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -78,6 +78,7 @@ import org.bukkit.craftbukkit.util.Versioning; @@ -32,5 +32,5 @@ index 539f492e..77c16fe2 100644 // Spigot end -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0213-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0216-Basic-PlayerProfile-API.patch similarity index 99% rename from Spigot-Server-Patches/0213-Basic-PlayerProfile-API.patch rename to Spigot-Server-Patches/0216-Basic-PlayerProfile-API.patch index fcd7d68824..9b05c74728 100644 --- a/Spigot-Server-Patches/0213-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0216-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 2fdd15767ecdb067c881c2a93cd8f0a679fefdaa Mon Sep 17 00:00:00 2001 +From 67efca2ab5f2797aeceff4a62a7b777f2ea616d9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -523,5 +523,5 @@ index 77c16fe2c..2dd7ed96a 100644 // Paper end } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0214-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0217-Shoulder-Entities-Release-API.patch similarity index 96% rename from Spigot-Server-Patches/0214-Shoulder-Entities-Release-API.patch rename to Spigot-Server-Patches/0217-Shoulder-Entities-Release-API.patch index ed48d4daba..2ff9afe62a 100644 --- a/Spigot-Server-Patches/0214-Shoulder-Entities-Release-API.patch +++ b/Spigot-Server-Patches/0217-Shoulder-Entities-Release-API.patch @@ -1,11 +1,11 @@ -From 20a3ba600feed3c199f6419f5884f8086c488a6f Mon Sep 17 00:00:00 2001 +From 6b016f7c3218f98e813b2bcd764943528f7be99e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 15:18:30 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 9cda8a17..deb0f4a9 100644 +index 9cda8a177..deb0f4a9c 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1721,21 +1721,48 @@ public abstract class EntityHuman extends EntityLiving { @@ -62,7 +62,7 @@ index 9cda8a17..deb0f4a9 100644 public abstract boolean isSpectator(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index a54548f0..a0128426 100644 +index a54548f02..a0128426f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -444,6 +444,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -99,5 +99,5 @@ index a54548f0..a0128426 100644 public org.bukkit.entity.Entity getShoulderEntityLeft() { if (!getHandle().getShoulderEntityLeft().isEmpty()) { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0215-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0218-Profile-Lookup-Events.patch similarity index 98% rename from Spigot-Server-Patches/0215-Profile-Lookup-Events.patch rename to Spigot-Server-Patches/0218-Profile-Lookup-Events.patch index a3d995fb88..be951b876c 100644 --- a/Spigot-Server-Patches/0215-Profile-Lookup-Events.patch +++ b/Spigot-Server-Patches/0218-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From 2477f11f28b1989f3546d74aab20b09306c8a168 Mon Sep 17 00:00:00 2001 +From 994ec4bf48918d37128a4497da0c4048d80066c3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 17:00:32 -0400 Subject: [PATCH] Profile Lookup Events @@ -81,5 +81,5 @@ index 3bcdb8f93..bb9894318 100644 } } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0216-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0219-Block-player-logins-during-server-shutdown.patch similarity index 90% rename from Spigot-Server-Patches/0216-Block-player-logins-during-server-shutdown.patch rename to Spigot-Server-Patches/0219-Block-player-logins-during-server-shutdown.patch index ffbf17d855..f9448cb0c6 100644 --- a/Spigot-Server-Patches/0216-Block-player-logins-during-server-shutdown.patch +++ b/Spigot-Server-Patches/0219-Block-player-logins-during-server-shutdown.patch @@ -1,11 +1,11 @@ -From c7ed96698d32b583244d6e2cb2b511c53f0f413a Mon Sep 17 00:00:00 2001 +From f36c3440727a1046b873964ca2c36b339cdf09a5 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 2 Jul 2017 21:35:56 -0500 Subject: [PATCH] Block player logins during server shutdown diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 2158fcd3..c5434e6b 100644 +index 2158fcd32..c5434e6ba 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -53,6 +53,12 @@ public class LoginListener implements PacketLoginInListener, ITickable { @@ -22,5 +22,5 @@ index 2158fcd3..c5434e6b 100644 this.b(); } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0217-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0220-Entity-fromMobSpawner.patch similarity index 89% rename from Spigot-Server-Patches/0217-Entity-fromMobSpawner.patch rename to Spigot-Server-Patches/0220-Entity-fromMobSpawner.patch index d31d9792f5..571795b26a 100644 --- a/Spigot-Server-Patches/0217-Entity-fromMobSpawner.patch +++ b/Spigot-Server-Patches/0220-Entity-fromMobSpawner.patch @@ -1,14 +1,14 @@ -From 37254b265b7e918cef1d4e01b9f6fd6396623f07 Mon Sep 17 00:00:00 2001 +From 57ed55129a54deecee7292fd00036b45ac0bd6ed Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a5ed651d..58fe1aa3 100644 +index b4233df5f..00791faf2 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener { +@@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper public final boolean defaultActivationState; public long activatedTick = Integer.MIN_VALUE; public boolean fromMobSpawner; @@ -16,7 +16,7 @@ index a5ed651d..58fe1aa3 100644 protected int numCollisions = 0; // Paper public void inactiveTick() { } // Spigot end -@@ -1590,6 +1591,10 @@ public abstract class Entity implements ICommandListener { +@@ -1590,6 +1591,10 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper if (origin != null) { nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ())); } @@ -27,7 +27,7 @@ index a5ed651d..58fe1aa3 100644 // Paper end return nbttagcompound; } catch (Throwable throwable) { -@@ -1739,6 +1744,8 @@ public abstract class Entity implements ICommandListener { +@@ -1739,6 +1744,8 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper if (!originTag.isEmpty()) { origin = new Location(world.getWorld(), originTag.getDoubleAt(0), originTag.getDoubleAt(1), originTag.getDoubleAt(2)); } @@ -37,7 +37,7 @@ index a5ed651d..58fe1aa3 100644 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index a5261d70..1ed0def1 100644 +index a5261d70b..1ed0def1e 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -107,6 +107,7 @@ public abstract class MobSpawnerAbstract { @@ -49,10 +49,10 @@ index a5261d70..1ed0def1 100644 if ( entity.world.spigotConfig.nerfSpawnerMobs ) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 14df5ff0..1571e4eb 100644 +index 3b25b8b73..bf7e6ed3f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -793,5 +793,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -800,5 +800,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { Location origin = getHandle().origin; return origin == null ? null : origin.clone(); } @@ -64,5 +64,5 @@ index 14df5ff0..1571e4eb 100644 // Paper end } -- -2.17.0 +2.18.0 diff --git a/Spigot-Server-Patches/0218-Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/0221-Fix-Anvil-Level-sync-to-client.patch similarity index 93% rename from Spigot-Server-Patches/0218-Fix-Anvil-Level-sync-to-client.patch rename to Spigot-Server-Patches/0221-Fix-Anvil-Level-sync-to-client.patch index 5de15bb37e..1c09236d6f 100644 --- a/Spigot-Server-Patches/0218-Fix-Anvil-Level-sync-to-client.patch +++ b/Spigot-Server-Patches/0221-Fix-Anvil-Level-sync-to-client.patch @@ -1,4 +1,4 @@ -From 050a2e794129a5d4ed1847e2d30441322e074197 Mon Sep 17 00:00:00 2001 +From 332880867e04c608e1bf1d4c4a4acd64b2e6daca Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 11 Jul 2017 23:17:57 -0400 Subject: [PATCH] Fix Anvil Level sync to client @@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client. Always send current level to the client, and instead make setWindowProperty set the level. diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java -index 175753c5..16ec6756 100644 +index 175753c5a..16ec67569 100644 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java @@ -376,9 +376,9 @@ public class ContainerAnvil extends Container { @@ -26,7 +26,7 @@ index 175753c5..16ec6756 100644 this.lastLevelCost = this.levelCost; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a9186b77..1269a02a 100644 +index a9186b77a..1269a02aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1328,6 +1328,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -42,5 +42,5 @@ index a9186b77..1269a02a 100644 return true; } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0219-Add-missing-coverages-for-getTileEntity-in-order-to-.patch b/Spigot-Server-Patches/0222-Add-missing-coverages-for-getTileEntity-in-order-to-.patch similarity index 93% rename from Spigot-Server-Patches/0219-Add-missing-coverages-for-getTileEntity-in-order-to-.patch rename to Spigot-Server-Patches/0222-Add-missing-coverages-for-getTileEntity-in-order-to-.patch index 8275ce9ee9..4980c7e286 100644 --- a/Spigot-Server-Patches/0219-Add-missing-coverages-for-getTileEntity-in-order-to-.patch +++ b/Spigot-Server-Patches/0222-Add-missing-coverages-for-getTileEntity-in-order-to-.patch @@ -1,4 +1,4 @@ -From caba0410ebdde4384bfc6807a048c9fdf87401b7 Mon Sep 17 00:00:00 2001 +From 59b994221ae889c52cdbd1e7fd0be8f8109231e2 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 22 Jul 2017 15:22:59 +0100 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt @@ -24,5 +24,5 @@ index 737ade74d..c06158e02 100644 return result; } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0220-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0223-Improve-the-Saddle-API-for-Horses.patch similarity index 94% rename from Spigot-Server-Patches/0220-Improve-the-Saddle-API-for-Horses.patch rename to Spigot-Server-Patches/0223-Improve-the-Saddle-API-for-Horses.patch index 1976aad2f7..b34d3bd4b7 100644 --- a/Spigot-Server-Patches/0220-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-Server-Patches/0223-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From 74e1dfd74867073c9afff75f279f5effa837d0b3 Mon Sep 17 00:00:00 2001 +From b648f2bd5daae8efe3272869f0e72f133aeeff01 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Dec 2016 16:24:06 -0500 Subject: [PATCH] Improve the Saddle API for Horses @@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa and access their saddle state separately from an interface shared with Armor. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java -index 14d04168..e56bef33 100644 +index 14d041680..e56bef334 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract; @@ -27,7 +27,7 @@ index 14d04168..e56bef33 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java -index 173818e6..2f685240 100644 +index 173818e68..2f6852404 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java @@ -4,7 +4,7 @@ import net.minecraft.server.IInventory; @@ -41,7 +41,7 @@ index 173818e6..2f685240 100644 super(inventory); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java new file mode 100644 -index 00000000..99cfbaf9 +index 000000000..99cfbaf90 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java @@ -0,0 +1,15 @@ @@ -61,5 +61,5 @@ index 00000000..99cfbaf9 + +} -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0221-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0224-Implement-ensureServerConversions-API.patch similarity index 90% rename from Spigot-Server-Patches/0221-Implement-ensureServerConversions-API.patch rename to Spigot-Server-Patches/0224-Implement-ensureServerConversions-API.patch index 75c6afb2ce..17ce798351 100644 --- a/Spigot-Server-Patches/0221-Implement-ensureServerConversions-API.patch +++ b/Spigot-Server-Patches/0224-Implement-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From 953a933ae57f5f8b5fbdb0148af7f7ee9d84f4ef Mon Sep 17 00:00:00 2001 +From 85f648495e3ba44c78f3f4e31ab8d207baf9d236 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 22:43:12 -0400 Subject: [PATCH] Implement ensureServerConversions API @@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 49ebad22..eb698733 100644 +index 49ebad22e..eb6987338 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -194,4 +194,11 @@ public final class CraftItemFactory implements ItemFactory { @@ -23,5 +23,5 @@ index 49ebad22..eb698733 100644 + // Paper end } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0222-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0225-Implement-getI18NDisplayName.patch similarity index 92% rename from Spigot-Server-Patches/0222-Implement-getI18NDisplayName.patch rename to Spigot-Server-Patches/0225-Implement-getI18NDisplayName.patch index ddc1dd3212..e706433a31 100644 --- a/Spigot-Server-Patches/0222-Implement-getI18NDisplayName.patch +++ b/Spigot-Server-Patches/0225-Implement-getI18NDisplayName.patch @@ -1,4 +1,4 @@ -From 51f002ac4471d23a58b5746bc588dd050a2bcb47 Mon Sep 17 00:00:00 2001 +From c4f9a656097efc7de9f9f5d001aac7fbcd5e7553 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:59:38 -0400 Subject: [PATCH] Implement getI18NDisplayName @@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this, You must replace the language file embedded in the server jar. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index eb698733..c2f26577 100644 +index eb6987338..c2f26577c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -200,5 +200,18 @@ public final class CraftItemFactory implements ItemFactory { @@ -31,5 +31,5 @@ index eb698733..c2f26577 100644 // Paper end } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0223-GH-806-Respect-saving-disabled-before-unloading-all-.patch b/Spigot-Server-Patches/0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch similarity index 90% rename from Spigot-Server-Patches/0223-GH-806-Respect-saving-disabled-before-unloading-all-.patch rename to Spigot-Server-Patches/0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch index f5ba13532d..8ab3413060 100644 --- a/Spigot-Server-Patches/0223-GH-806-Respect-saving-disabled-before-unloading-all-.patch +++ b/Spigot-Server-Patches/0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch @@ -1,4 +1,4 @@ -From eb4e6e2473ded2b465e7d7fcf510f9aadc4cfe93 Mon Sep 17 00:00:00 2001 +From 356b716038e7b3ce158de43b3649518a23d50abd Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 27 Jul 2017 00:06:43 -0400 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks @@ -9,7 +9,7 @@ This behavior causes a save to occur even though saving was supposed to be turne It's triggered when Hell/End worlds are empty of players. diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 0b10f168..4af55732 100644 +index 0b10f1684..4af557321 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -220,7 +220,7 @@ public class PlayerChunkMap { @@ -22,5 +22,5 @@ index 0b10f168..4af55732 100644 } } // Paper timing -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0224-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch similarity index 96% rename from Spigot-Server-Patches/0224-ProfileWhitelistVerifyEvent.patch rename to Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch index 3585369d38..fe2020f158 100644 --- a/Spigot-Server-Patches/0224-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch @@ -1,11 +1,11 @@ -From 4c23b0fe27af664d733b1db39eb4804a8d81c38c Mon Sep 17 00:00:00 2001 +From 478ce7dd9077369efd3b2b8e90b8a537e3c0c576 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:10 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 15af94b3..1c0c1bd8 100644 +index 3e5122486..b478f385a 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -542,9 +542,9 @@ public abstract class PlayerList { @@ -48,5 +48,5 @@ index 15af94b3..1c0c1bd8 100644 public boolean isOp(GameProfile gameprofile) { return this.operators.d(gameprofile) || this.server.R() && this.server.worlds.get(0).getWorldData().u() && this.server.Q().equalsIgnoreCase(gameprofile.getName()) || this.u; // CraftBukkit -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0225-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0228-Fix-this-stupid-bullshit.patch similarity index 93% rename from Spigot-Server-Patches/0225-Fix-this-stupid-bullshit.patch rename to Spigot-Server-Patches/0228-Fix-this-stupid-bullshit.patch index d8b02fa8a9..1dfa0dbfd9 100644 --- a/Spigot-Server-Patches/0225-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0228-Fix-this-stupid-bullshit.patch @@ -1,4 +1,4 @@ -From 2fa3cd75bba6abd3b22121568acff664bc26c994 Mon Sep 17 00:00:00 2001 +From 2a68cb4cbc3ea0c0286a664799ae43b26a3837be Mon Sep 17 00:00:00 2001 From: DemonWav Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit @@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa and to provide some level of hint without being disruptive. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d3d848f8..21628e19 100644 +index c9e8a8737..ae2c51f5d 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -209,10 +209,12 @@ public class Main { @@ -29,5 +29,5 @@ index d3d848f8..21628e19 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0226-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0229-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 88% rename from Spigot-Server-Patches/0226-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to Spigot-Server-Patches/0229-Ocelot-despawns-should-honor-nametags-and-leash.patch index e8eb735489..311d2615ef 100644 --- a/Spigot-Server-Patches/0226-Ocelot-despawns-should-honor-nametags-and-leash.patch +++ b/Spigot-Server-Patches/0229-Ocelot-despawns-should-honor-nametags-and-leash.patch @@ -1,11 +1,11 @@ -From 4f99b255c13f02401c796105308ab123146ed09b Mon Sep 17 00:00:00 2001 +From cee3ee7d056d74ede8ec145e8028fdff1ba18ec4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:54:40 -0500 Subject: [PATCH] Ocelot despawns should honor nametags and leash diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index 5a76821e..858bbef5 100644 +index 5a76821ea..858bbef5b 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -58,7 +58,7 @@ public class EntityOcelot extends EntityTameableAnimal { @@ -18,5 +18,5 @@ index 5a76821e..858bbef5 100644 protected void initAttributes() { -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0227-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 91% rename from Spigot-Server-Patches/0227-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch index 6a023d33ee..070b02d174 100644 --- a/Spigot-Server-Patches/0227-Reset-spawner-timer-when-spawner-event-is-cancelled.patch +++ b/Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch @@ -1,11 +1,11 @@ -From bfb645af77354320d1f86b3da34c0c9c92aa495c Mon Sep 17 00:00:00 2001 +From b6470fed3dcdea14ff3995a385bef6588bcce713 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:45:19 -0500 Subject: [PATCH] Reset spawner timer when spawner event is cancelled diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 1ed0def1..87fe4775 100644 +index 1ed0def1e..87fe4775f 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -113,6 +113,9 @@ public abstract class MobSpawnerAbstract { @@ -28,5 +28,5 @@ index 1ed0def1..87fe4775 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0228-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch b/Spigot-Server-Patches/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch similarity index 89% rename from Spigot-Server-Patches/0228-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch rename to Spigot-Server-Patches/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch index 4e7abd94f3..12db003ae5 100644 --- a/Spigot-Server-Patches/0228-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch +++ b/Spigot-Server-Patches/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch @@ -1,4 +1,4 @@ -From 1fde548e4122113c845379d7cbef2e05767b1ca4 Mon Sep 17 00:00:00 2001 +From ddb5420fbc247f84c5d4877b77716179535385ba Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Fri, 11 Aug 2017 03:29:26 +0200 Subject: [PATCH] MC-94186 Fix dragon egg falling in lazy chunks @@ -8,7 +8,7 @@ Fixes falling dragon eggs in lazy chunks fall to the block below the last empty See also https://bugs.mojang.com/browse/MC-94186 diff --git a/src/main/java/net/minecraft/server/BlockDragonEgg.java b/src/main/java/net/minecraft/server/BlockDragonEgg.java -index ce186f82..291342c9 100644 +index ce186f825..291342c90 100644 --- a/src/main/java/net/minecraft/server/BlockDragonEgg.java +++ b/src/main/java/net/minecraft/server/BlockDragonEgg.java @@ -44,7 +44,7 @@ public class BlockDragonEgg extends Block { @@ -21,5 +21,5 @@ index ce186f82..291342c9 100644 } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0229-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 91% rename from Spigot-Server-Patches/0229-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to Spigot-Server-Patches/0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch index bbf74bfcb8..fb2e839fae 100644 --- a/Spigot-Server-Patches/0229-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -1,11 +1,11 @@ -From 4f4f5c11402533599513023b147f1b72e53d091a Mon Sep 17 00:00:00 2001 +From bf2acf1bc8d0a4281451a2bf074bfa3b0b9956ec Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 9 Aug 2017 17:51:22 -0500 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b0139fff..00513d02 100644 +index b85c55168..90f946e57 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1572,7 +1572,11 @@ public abstract class World implements IBlockAccess { @@ -22,5 +22,5 @@ index b0139fff..00513d02 100644 this.tileEntityListUnload.clear(); } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0230-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 94% rename from Spigot-Server-Patches/0230-Allow-specifying-a-custom-authentication-servers-dow.patch rename to Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch index ddfe7c9e25..a01d7bc9bf 100644 --- a/Spigot-Server-Patches/0230-Allow-specifying-a-custom-authentication-servers-dow.patch +++ b/Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch @@ -1,4 +1,4 @@ -From cc4dbb1de0f22f088fbe86a6323b98dbc3227ef3 Mon Sep 17 00:00:00 2001 +From abc6db5a95b3549c1203ace470c1e17cbb4a9ea3 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 17 Aug 2017 16:08:20 -0700 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick @@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index dbafef02..ec89ecfc 100644 +index dbafef023..ec89ecfca 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -1,5 +1,6 @@ @@ -27,7 +27,7 @@ index dbafef02..ec89ecfc 100644 + } } diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index c5434e6b..75df9283 100644 +index c5434e6ba..75df92836 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -250,6 +250,10 @@ public class LoginListener implements PacketLoginInListener, ITickable { @@ -42,5 +42,5 @@ index c5434e6b..75df9283 100644 LoginListener.c.error("Couldn\'t verify username because servers are unavailable"); } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0231-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0234-LivingEntity-setKiller.patch similarity index 91% rename from Spigot-Server-Patches/0231-LivingEntity-setKiller.patch rename to Spigot-Server-Patches/0234-LivingEntity-setKiller.patch index 3044cf014e..b5fc153497 100644 --- a/Spigot-Server-Patches/0231-LivingEntity-setKiller.patch +++ b/Spigot-Server-Patches/0234-LivingEntity-setKiller.patch @@ -1,11 +1,11 @@ -From a894cdb9a87abbfb870f4448215c61f9355c24db Mon Sep 17 00:00:00 2001 +From 45af741aba1ed94d65871ea3b47cabac4184a8de Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:48 -0500 Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index d4d51688..a7b07637 100644 +index d4d51688c..a7b076377 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -252,6 +252,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -26,5 +26,5 @@ index d4d51688..a7b07637 100644 return addPotionEffect(effect, false); } -- -2.14.3 +2.18.0 diff --git a/Spigot-Server-Patches/0232-Anti-Xray.patch b/Spigot-Server-Patches/0235-Anti-Xray.patch similarity index 99% rename from Spigot-Server-Patches/0232-Anti-Xray.patch rename to Spigot-Server-Patches/0235-Anti-Xray.patch index b083b82d5d..947ef0735b 100644 --- a/Spigot-Server-Patches/0232-Anti-Xray.patch +++ b/Spigot-Server-Patches/0235-Anti-Xray.patch @@ -1,4 +1,4 @@ -From 804f065b55b09c5c81c3480b59ccd13b819b3938 Mon Sep 17 00:00:00 2001 +From f0b71b83e108ec6fcb256dbc1fcc79ee86edd311 Mon Sep 17 00:00:00 2001 From: stonar96 Date: Thu, 21 Sep 2017 00:38:47 +0200 Subject: [PATCH] Anti-Xray @@ -1008,10 +1008,10 @@ index 000000000..8ea2beb59 + } +} diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index ce76a0e5d..aecfa331d 100644 +index 27a36b2b0..cb33cf902 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -129,7 +129,7 @@ public class Chunk { +@@ -158,7 +158,7 @@ public class Chunk { int j1 = i1 >> 4; if (this.sections[j1] == Chunk.a) { @@ -1020,7 +1020,7 @@ index ce76a0e5d..aecfa331d 100644 } this.sections[j1].setType(k, i1 & 15, l, iblockdata); -@@ -496,7 +496,7 @@ public class Chunk { +@@ -525,7 +525,7 @@ public class Chunk { return null; } @@ -1029,7 +1029,7 @@ index ce76a0e5d..aecfa331d 100644 this.sections[j >> 4] = chunksection; flag = j >= i1; } -@@ -582,7 +582,7 @@ public class Chunk { +@@ -611,7 +611,7 @@ public class Chunk { ChunkSection chunksection = this.sections[k >> 4]; if (chunksection == Chunk.a) { diff --git a/Spigot-Server-Patches/0233-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch similarity index 96% rename from Spigot-Server-Patches/0233-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch rename to Spigot-Server-Patches/0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index 34e8bb9bfa..afe2711a0f 100644 --- a/Spigot-Server-Patches/0233-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/Spigot-Server-Patches/0236-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -1,4 +1,4 @@ -From 1126bd5886087ed69c2860cd3e5c33823fe69b2a Mon Sep 17 00:00:00 2001 +From 8ea6c7c92ee771c81f1b19594919eda513a1c96e Mon Sep 17 00:00:00 2001 From: Minecrell Date: Mon, 18 Sep 2017 12:00:03 +0200 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger diff --git a/Spigot-Server-Patches/0234-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0237-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 98% rename from Spigot-Server-Patches/0234-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to Spigot-Server-Patches/0237-Handle-plugin-prefixes-using-Log4J-configuration.patch index f3235aaf96..9af6b03502 100644 --- a/Spigot-Server-Patches/0234-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0237-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -1,4 +1,4 @@ -From 512bfac63c538236abb822d031dc106c9cbb279f Mon Sep 17 00:00:00 2001 +From 48096c9ea13e424b5a060679092bc4b7007dfa19 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:55 +0200 Subject: [PATCH] Handle plugin prefixes using Log4J configuration diff --git a/Spigot-Server-Patches/0235-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0238-Include-Log4J2-SLF4J-implementation.patch similarity index 91% rename from Spigot-Server-Patches/0235-Include-Log4J2-SLF4J-implementation.patch rename to Spigot-Server-Patches/0238-Include-Log4J2-SLF4J-implementation.patch index 9428b47131..3d0aa63d63 100644 --- a/Spigot-Server-Patches/0235-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0238-Include-Log4J2-SLF4J-implementation.patch @@ -1,4 +1,4 @@ -From be659b782e26a5a9f87641cd46ba7698776fcaca Mon Sep 17 00:00:00 2001 +From e0bcbbb023b13d0dfcfd1ee15bb807617cd1973f Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:35 +0200 Subject: [PATCH] Include Log4J2 SLF4J implementation diff --git a/Spigot-Server-Patches/0236-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch similarity index 97% rename from Spigot-Server-Patches/0236-Disable-logger-prefix-for-various-plugins-bypassing-.patch rename to Spigot-Server-Patches/0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch index b9c5239f6f..c605dd3c7f 100644 --- a/Spigot-Server-Patches/0236-Disable-logger-prefix-for-various-plugins-bypassing-.patch +++ b/Spigot-Server-Patches/0239-Disable-logger-prefix-for-various-plugins-bypassing-.patch @@ -1,4 +1,4 @@ -From 82ffd297051a129e48492ee39ebf293bf3b64c49 Mon Sep 17 00:00:00 2001 +From 5ffc7918dcf0fcd87916342ddb568352e56ba098 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sat, 23 Sep 2017 21:07:20 +0200 Subject: [PATCH] Disable logger prefix for various plugins bypassing the diff --git a/Spigot-Server-Patches/0237-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0240-Add-PlayerJumpEvent.patch similarity index 98% rename from Spigot-Server-Patches/0237-Add-PlayerJumpEvent.patch rename to Spigot-Server-Patches/0240-Add-PlayerJumpEvent.patch index 97095a7af3..e5570e9497 100644 --- a/Spigot-Server-Patches/0237-Add-PlayerJumpEvent.patch +++ b/Spigot-Server-Patches/0240-Add-PlayerJumpEvent.patch @@ -1,4 +1,4 @@ -From 0a884dd3df347b2e3e44c1e19e5f6474f108e8c9 Mon Sep 17 00:00:00 2001 +From 1ada468a04f4567237b4180c750ed48915b44997 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:44 -0400 Subject: [PATCH] Add PlayerJumpEvent diff --git a/Spigot-Server-Patches/0238-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0241-handle-PacketPlayInKeepAlive-async.patch similarity index 97% rename from Spigot-Server-Patches/0238-handle-PacketPlayInKeepAlive-async.patch rename to Spigot-Server-Patches/0241-handle-PacketPlayInKeepAlive-async.patch index 3a2aa25834..82a9d57fcc 100644 --- a/Spigot-Server-Patches/0238-handle-PacketPlayInKeepAlive-async.patch +++ b/Spigot-Server-Patches/0241-handle-PacketPlayInKeepAlive-async.patch @@ -1,4 +1,4 @@ -From c969945f60e231630312e13ec01f36b916d59f68 Mon Sep 17 00:00:00 2001 +From 28771b827cc057e201d9284b910b544de9f914fe Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 5 Oct 2017 01:54:07 +0100 Subject: [PATCH] handle PacketPlayInKeepAlive async diff --git a/Spigot-Server-Patches/0239-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0242-Expose-client-protocol-version-and-virtual-host.patch similarity index 98% rename from Spigot-Server-Patches/0239-Expose-client-protocol-version-and-virtual-host.patch rename to Spigot-Server-Patches/0242-Expose-client-protocol-version-and-virtual-host.patch index fe679937c3..2d0c1ab7cd 100644 --- a/Spigot-Server-Patches/0239-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-Server-Patches/0242-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From af394416c12e2f60579f3f08fd6d9629c0c299a1 Mon Sep 17 00:00:00 2001 +From f50072ea408132ad91ddd246ba91c1b7417998ab Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:45:20 +0200 Subject: [PATCH] Expose client protocol version and virtual host diff --git a/Spigot-Server-Patches/0240-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0243-revert-serverside-behavior-of-keepalives.patch similarity index 98% rename from Spigot-Server-Patches/0240-revert-serverside-behavior-of-keepalives.patch rename to Spigot-Server-Patches/0243-revert-serverside-behavior-of-keepalives.patch index 6bf3390bde..fd53eaacce 100644 --- a/Spigot-Server-Patches/0240-revert-serverside-behavior-of-keepalives.patch +++ b/Spigot-Server-Patches/0243-revert-serverside-behavior-of-keepalives.patch @@ -1,4 +1,4 @@ -From dda581e2f95d1e878c6dfe7468527a7df11e9adb Mon Sep 17 00:00:00 2001 +From 69b083f70da6bf8655cb789af2af6d0fd8764065 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 15 Oct 2017 00:29:07 +0100 Subject: [PATCH] revert serverside behavior of keepalives diff --git a/Spigot-Server-Patches/0241-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/Spigot-Server-Patches/0244-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch similarity index 95% rename from Spigot-Server-Patches/0241-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch rename to Spigot-Server-Patches/0244-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch index 048a50390e..4e5023a433 100644 --- a/Spigot-Server-Patches/0241-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch +++ b/Spigot-Server-Patches/0244-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch @@ -1,4 +1,4 @@ -From 72fb32f1476e6f822e14c48f56f6c4f4713172af Mon Sep 17 00:00:00 2001 +From 5cfd4e4387b394d8f49204d8cba5b5f410fb2443 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Fri, 20 Oct 2017 04:33:45 +0200 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in diff --git a/Spigot-Server-Patches/0242-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0245-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 98% rename from Spigot-Server-Patches/0242-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to Spigot-Server-Patches/0245-Send-attack-SoundEffects-only-to-players-who-can-see.patch index c34db381d5..a33a0b156c 100644 --- a/Spigot-Server-Patches/0242-Send-attack-SoundEffects-only-to-players-who-can-see.patch +++ b/Spigot-Server-Patches/0245-Send-attack-SoundEffects-only-to-players-who-can-see.patch @@ -1,4 +1,4 @@ -From db87b402a8141a989c8998c9704eb250f2a3a43e Mon Sep 17 00:00:00 2001 +From 446ba2913490acc93574cbe8dab2ad241e3bdfc6 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 31 Oct 2017 03:26:18 +0100 Subject: [PATCH] Send attack SoundEffects only to players who can see the diff --git a/Spigot-Server-Patches/0243-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0246-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 97% rename from Spigot-Server-Patches/0243-Option-for-maximum-exp-value-when-merging-orbs.patch rename to Spigot-Server-Patches/0246-Option-for-maximum-exp-value-when-merging-orbs.patch index 1b3a9486ce..c998118c46 100644 --- a/Spigot-Server-Patches/0243-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0246-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -1,4 +1,4 @@ -From 23b635752379ea7023f015f78db839db97bd56e0 Mon Sep 17 00:00:00 2001 +From d3ad905c6a3156cbf9484834eea088efb106b4dd Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 10 Nov 2017 23:03:12 -0500 Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/Spigot-Server-Patches/0244-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0247-Add-PlayerArmorChangeEvent.patch similarity index 97% rename from Spigot-Server-Patches/0244-Add-PlayerArmorChangeEvent.patch rename to Spigot-Server-Patches/0247-Add-PlayerArmorChangeEvent.patch index d11b7a1be4..8a04bbb536 100644 --- a/Spigot-Server-Patches/0244-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-Server-Patches/0247-Add-PlayerArmorChangeEvent.patch @@ -1,4 +1,4 @@ -From 1e2b4a3ca945ce4688ed7e13df4c305ba810f49e Mon Sep 17 00:00:00 2001 +From 967b71010b6429abb9d4c8f2dbc62b2424d510d7 Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:46:34 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/Spigot-Server-Patches/0245-Improve-Structures-Checking.patch b/Spigot-Server-Patches/0248-Improve-Structures-Checking.patch similarity index 99% rename from Spigot-Server-Patches/0245-Improve-Structures-Checking.patch rename to Spigot-Server-Patches/0248-Improve-Structures-Checking.patch index 63fda4e659..69966591d1 100644 --- a/Spigot-Server-Patches/0245-Improve-Structures-Checking.patch +++ b/Spigot-Server-Patches/0248-Improve-Structures-Checking.patch @@ -1,4 +1,4 @@ -From 5599edfac6325734591209213d3d37c2841aa1e9 Mon Sep 17 00:00:00 2001 +From 13d727f38a8615e821d1794176154b34780c0c19 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 11 Nov 2017 17:57:39 -0500 Subject: [PATCH] Improve Structures Checking diff --git a/Spigot-Server-Patches/0246-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0249-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 94% rename from Spigot-Server-Patches/0246-Prevent-logins-from-being-processed-when-the-player-.patch rename to Spigot-Server-Patches/0249-Prevent-logins-from-being-processed-when-the-player-.patch index afa6f639b8..b7e3884261 100644 --- a/Spigot-Server-Patches/0246-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/Spigot-Server-Patches/0249-Prevent-logins-from-being-processed-when-the-player-.patch @@ -1,4 +1,4 @@ -From 1c8f764dc856a224c003f7cba4feb712e1bde8bf Mon Sep 17 00:00:00 2001 +From b8d15e70c042d8aea4b93a01c127b6189dedde3b Mon Sep 17 00:00:00 2001 From: killme Date: Sun, 12 Nov 2017 19:40:01 +0100 Subject: [PATCH] Prevent logins from being processed when the player has diff --git a/Spigot-Server-Patches/0247-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0250-use-CB-BlockState-implementations-for-captured-block.patch similarity index 96% rename from Spigot-Server-Patches/0247-use-CB-BlockState-implementations-for-captured-block.patch rename to Spigot-Server-Patches/0250-use-CB-BlockState-implementations-for-captured-block.patch index c7fb051045..2b7eea7ff6 100644 --- a/Spigot-Server-Patches/0247-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0250-use-CB-BlockState-implementations-for-captured-block.patch @@ -1,4 +1,4 @@ -From 7b58a5fe06de0cc55536a8d63385f8c589eacaa6 Mon Sep 17 00:00:00 2001 +From 59316f81fc224550436b7d841068d234a68ab9ae Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 16 Nov 2017 12:12:41 +0000 Subject: [PATCH] use CB BlockState implementations for captured blocks diff --git a/Spigot-Server-Patches/0248-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0251-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 95% rename from Spigot-Server-Patches/0248-API-to-get-a-BlockState-without-a-snapshot.patch rename to Spigot-Server-Patches/0251-API-to-get-a-BlockState-without-a-snapshot.patch index 0a86501f61..8c39c92d7b 100644 --- a/Spigot-Server-Patches/0248-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0251-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From 1b84dbaa916aab00f95f098c28769b1127e39b2f Mon Sep 17 00:00:00 2001 +From d92126ecf2330dfafa65d2dde1dd6d1966cd5ca1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:08:22 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -13,10 +13,10 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE If Tile Entity was null, correct Sign to return empty lines instead of null diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 537e4b155..8e2d55a73 100644 +index d3bc13726..cc7f2069d 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java -@@ -264,7 +264,12 @@ public abstract class TileEntity { +@@ -284,7 +284,12 @@ public abstract class TileEntity implements KeyedObject { } // CraftBukkit start - add method @@ -29,7 +29,7 @@ index 537e4b155..8e2d55a73 100644 if (world == null) return null; // Spigot start org.bukkit.block.Block block = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()); -@@ -273,7 +278,7 @@ public abstract class TileEntity { +@@ -293,7 +298,7 @@ public abstract class TileEntity implements KeyedObject { return null; } // Spigot end diff --git a/Spigot-Server-Patches/0249-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0252-AsyncTabCompleteEvent.patch similarity index 99% rename from Spigot-Server-Patches/0249-AsyncTabCompleteEvent.patch rename to Spigot-Server-Patches/0252-AsyncTabCompleteEvent.patch index dc6c494304..9b7751a252 100644 --- a/Spigot-Server-Patches/0249-AsyncTabCompleteEvent.patch +++ b/Spigot-Server-Patches/0252-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From b40f20ff1ac10b7ef1098e8c3f3fad23d6e73887 Mon Sep 17 00:00:00 2001 +From 35b3a28d37d46a353ca2999caced2d500ec06c80 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:19:58 -0500 Subject: [PATCH] AsyncTabCompleteEvent diff --git a/Spigot-Server-Patches/0250-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0253-Avoid-NPE-in-PathfinderGoalTempt.patch similarity index 93% rename from Spigot-Server-Patches/0250-Avoid-NPE-in-PathfinderGoalTempt.patch rename to Spigot-Server-Patches/0253-Avoid-NPE-in-PathfinderGoalTempt.patch index 3e2f3e1856..bbc853dbd4 100644 --- a/Spigot-Server-Patches/0250-Avoid-NPE-in-PathfinderGoalTempt.patch +++ b/Spigot-Server-Patches/0253-Avoid-NPE-in-PathfinderGoalTempt.patch @@ -1,4 +1,4 @@ -From 32a109d078d259d8e4c16bb59ed385cdb0a86b83 Mon Sep 17 00:00:00 2001 +From 9879e7c10bb47f2cfaa41d001896592517a6b429 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 29 Nov 2017 22:18:54 -0500 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt diff --git a/Spigot-Server-Patches/0251-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch b/Spigot-Server-Patches/0254-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch similarity index 86% rename from Spigot-Server-Patches/0251-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch rename to Spigot-Server-Patches/0254-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch index c11b71e0d9..82f9cb5660 100644 --- a/Spigot-Server-Patches/0251-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch +++ b/Spigot-Server-Patches/0254-Don-t-blindly-send-unlit-chunks-when-lighting-update.patch @@ -1,4 +1,4 @@ -From 3189e3af74a86585787bd2adbfa1315620bbd417 Mon Sep 17 00:00:00 2001 +From dd48bbfe6038596192469c818bb31f0a29d71646 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 18 Dec 2017 07:26:56 +0000 Subject: [PATCH] Don't blindly send unlit chunks when lighting updates are @@ -18,11 +18,11 @@ only send chunks which are actually ready to be sent, otherwise, we will always send chunks. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index aecfa331d..7cd537a59 100644 +index cb33cf902..87d0d426f 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -39,7 +39,7 @@ public class Chunk { - final PaperLightingQueue.LightingQueue lightingQueue = new PaperLightingQueue.LightingQueue(this); // Paper +@@ -68,7 +68,7 @@ public class Chunk { + // Paper end private boolean done; private boolean lit; - private boolean r; @@ -30,7 +30,7 @@ index aecfa331d..7cd537a59 100644 private boolean s; private boolean t; private long lastSaved; -@@ -1137,7 +1137,11 @@ public class Chunk { +@@ -1174,7 +1174,11 @@ public class Chunk { * We cannot unfortunately do this lighting stage during chunk gen as it appears to put a lot more noticeable load on the server, than when it is done at play time. * For now at least we will simply send all chunks, in accordance with pre 1.7 behaviour. */ diff --git a/Spigot-Server-Patches/0252-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0255-PlayerPickupExperienceEvent.patch similarity index 94% rename from Spigot-Server-Patches/0252-PlayerPickupExperienceEvent.patch rename to Spigot-Server-Patches/0255-PlayerPickupExperienceEvent.patch index d7885a0c03..08f83f7947 100644 --- a/Spigot-Server-Patches/0252-PlayerPickupExperienceEvent.patch +++ b/Spigot-Server-Patches/0255-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From b9462b799af5cf7d7fff939ab35e4d1ef8291b06 Mon Sep 17 00:00:00 2001 +From b5f98ca545e3f16e608e3c0ef67be1d04188c261 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:02:53 -0500 Subject: [PATCH] PlayerPickupExperienceEvent diff --git a/Spigot-Server-Patches/0253-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0256-ExperienceOrbMergeEvent.patch similarity index 95% rename from Spigot-Server-Patches/0253-ExperienceOrbMergeEvent.patch rename to Spigot-Server-Patches/0256-ExperienceOrbMergeEvent.patch index e2de83df50..080f2acdb4 100644 --- a/Spigot-Server-Patches/0253-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0256-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 8bba43fbcd5555066af8c96d92bc5d528590b0bb Mon Sep 17 00:00:00 2001 +From 4104f9583f512022acc4fe898d4487df59a1029a Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:57:26 -0500 Subject: [PATCH] ExperienceOrbMergeEvent diff --git a/Spigot-Server-Patches/0254-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0257-Ability-to-apply-mending-to-XP-API.patch similarity index 98% rename from Spigot-Server-Patches/0254-Ability-to-apply-mending-to-XP-API.patch rename to Spigot-Server-Patches/0257-Ability-to-apply-mending-to-XP-API.patch index 268ee81af9..4341e550ea 100644 --- a/Spigot-Server-Patches/0254-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-Server-Patches/0257-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From 4c489e89e39fcb4fec045b5a7a67d5cce33aa7c1 Mon Sep 17 00:00:00 2001 +From 5e3717f8fbdc425eb88570efa92fe4c2df8187bc Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:36:49 -0500 Subject: [PATCH] Ability to apply mending to XP API diff --git a/Spigot-Server-Patches/0255-Configurable-Chunks-Sends-per-Tick-setting.patch b/Spigot-Server-Patches/0258-Configurable-Chunks-Sends-per-Tick-setting.patch similarity index 96% rename from Spigot-Server-Patches/0255-Configurable-Chunks-Sends-per-Tick-setting.patch rename to Spigot-Server-Patches/0258-Configurable-Chunks-Sends-per-Tick-setting.patch index 64480b3419..54e0ce74f4 100644 --- a/Spigot-Server-Patches/0255-Configurable-Chunks-Sends-per-Tick-setting.patch +++ b/Spigot-Server-Patches/0258-Configurable-Chunks-Sends-per-Tick-setting.patch @@ -1,4 +1,4 @@ -From b5d1b1c0569564884364040d64875b020c464c62 Mon Sep 17 00:00:00 2001 +From 2de47d2a780d542cb93b6fa85bb8e90535a8de14 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 1 Jan 2018 15:41:59 -0500 Subject: [PATCH] Configurable Chunks Sends per Tick setting diff --git a/Spigot-Server-Patches/0256-Configurable-Max-Chunk-Gens-per-Tick.patch b/Spigot-Server-Patches/0259-Configurable-Max-Chunk-Gens-per-Tick.patch similarity index 98% rename from Spigot-Server-Patches/0256-Configurable-Max-Chunk-Gens-per-Tick.patch rename to Spigot-Server-Patches/0259-Configurable-Max-Chunk-Gens-per-Tick.patch index 18a7ac3481..2032691ad4 100644 --- a/Spigot-Server-Patches/0256-Configurable-Max-Chunk-Gens-per-Tick.patch +++ b/Spigot-Server-Patches/0259-Configurable-Max-Chunk-Gens-per-Tick.patch @@ -1,4 +1,4 @@ -From 8763a29d704f1a5dfc16a419e5f4bda7da76b587 Mon Sep 17 00:00:00 2001 +From 9b92490838fd8805b3e867cc7235a0bcf0854f7f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 1 Jan 2018 16:10:24 -0500 Subject: [PATCH] Configurable Max Chunk Gens per Tick diff --git a/Spigot-Server-Patches/0257-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0260-Make-max-squid-spawn-height-configurable.patch similarity index 96% rename from Spigot-Server-Patches/0257-Make-max-squid-spawn-height-configurable.patch rename to Spigot-Server-Patches/0260-Make-max-squid-spawn-height-configurable.patch index f791605694..69c6cd9f40 100644 --- a/Spigot-Server-Patches/0257-Make-max-squid-spawn-height-configurable.patch +++ b/Spigot-Server-Patches/0260-Make-max-squid-spawn-height-configurable.patch @@ -1,4 +1,4 @@ -From 79f022faf9edc84a85588c097dc90ae715216738 Mon Sep 17 00:00:00 2001 +From 0d322700c9153d75a278138ef862ea9cd8fad05b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 11 Jan 2018 16:47:28 -0600 Subject: [PATCH] Make max squid spawn height configurable diff --git a/Spigot-Server-Patches/0258-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0261-PreCreatureSpawnEvent.patch similarity index 98% rename from Spigot-Server-Patches/0258-PreCreatureSpawnEvent.patch rename to Spigot-Server-Patches/0261-PreCreatureSpawnEvent.patch index 7a035d6477..3f84bc97eb 100644 --- a/Spigot-Server-Patches/0258-PreCreatureSpawnEvent.patch +++ b/Spigot-Server-Patches/0261-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From e39a40897af178906e93bf6415936e75dcdcb137 Mon Sep 17 00:00:00 2001 +From 0d9573cce034afcfd6b1f86fd955aeae30d06f30 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:01:31 -0500 Subject: [PATCH] PreCreatureSpawnEvent diff --git a/Spigot-Server-Patches/0259-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0262-PlayerNaturallySpawnCreaturesEvent.patch similarity index 96% rename from Spigot-Server-Patches/0259-PlayerNaturallySpawnCreaturesEvent.patch rename to Spigot-Server-Patches/0262-PlayerNaturallySpawnCreaturesEvent.patch index 5cdbda4c27..4d1453da2d 100644 --- a/Spigot-Server-Patches/0259-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-Server-Patches/0262-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From 232a16a575ebefa275a56c0731a58df323473bcc Mon Sep 17 00:00:00 2001 +From 0e4807dea8c78e44fb2aae08d851040732fc2ec6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:36:02 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent diff --git a/Spigot-Server-Patches/0260-Add-SkullMeta.setPlayerProfile-API.patch b/Spigot-Server-Patches/0263-Add-SkullMeta.setPlayerProfile-API.patch similarity index 96% rename from Spigot-Server-Patches/0260-Add-SkullMeta.setPlayerProfile-API.patch rename to Spigot-Server-Patches/0263-Add-SkullMeta.setPlayerProfile-API.patch index e6d2bb6421..47afa286ab 100644 --- a/Spigot-Server-Patches/0260-Add-SkullMeta.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0263-Add-SkullMeta.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 3a3a658f248587d4545b22283f94af64b7d7d361 Mon Sep 17 00:00:00 2001 +From 1a2d4a99770a6eacb577d1f7d7daba01af23eb70 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:36:25 -0500 Subject: [PATCH] Add SkullMeta.setPlayerProfile API diff --git a/Spigot-Server-Patches/0261-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0264-Fill-Profile-Property-Events.patch similarity index 96% rename from Spigot-Server-Patches/0261-Fill-Profile-Property-Events.patch rename to Spigot-Server-Patches/0264-Fill-Profile-Property-Events.patch index f50991845e..e668ddc081 100644 --- a/Spigot-Server-Patches/0261-Fill-Profile-Property-Events.patch +++ b/Spigot-Server-Patches/0264-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From e984aa8d9690e7842f69614d9f0f3b37d917279f Mon Sep 17 00:00:00 2001 +From 7de0f8add5f32e662c9354154f52a63942cb1274 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:26 -0500 Subject: [PATCH] Fill Profile Property Events diff --git a/Spigot-Server-Patches/0262-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0265-PlayerAdvancementCriterionGrantEvent.patch similarity index 94% rename from Spigot-Server-Patches/0262-PlayerAdvancementCriterionGrantEvent.patch rename to Spigot-Server-Patches/0265-PlayerAdvancementCriterionGrantEvent.patch index 877f0d9ce4..da78b8d31e 100644 --- a/Spigot-Server-Patches/0262-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-Server-Patches/0265-PlayerAdvancementCriterionGrantEvent.patch @@ -1,4 +1,4 @@ -From 606a42a3c07a7e49d68933c01f3681b49667d571 Mon Sep 17 00:00:00 2001 +From 7882f76fb4a440a3e3158ff1615c7fada2225b95 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:29 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent diff --git a/Spigot-Server-Patches/0263-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch b/Spigot-Server-Patches/0266-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch similarity index 94% rename from Spigot-Server-Patches/0263-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch rename to Spigot-Server-Patches/0266-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch index e711616f0d..2303488509 100644 --- a/Spigot-Server-Patches/0263-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch +++ b/Spigot-Server-Patches/0266-MC-99321-Dont-check-for-blocked-double-chest-for-hop.patch @@ -1,4 +1,4 @@ -From 5430376a868bfe7d5e6b26745efc104ae8c477f1 Mon Sep 17 00:00:00 2001 +From 3d9485b9cd411e336dac59b8c0cb9c0bc0d82ceb Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 24 Jan 2018 20:06:39 -0500 Subject: [PATCH] MC-99321 - Dont check for blocked double chest for hoppers diff --git a/Spigot-Server-Patches/0264-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0267-Add-ArmorStand-Item-Meta.patch similarity index 99% rename from Spigot-Server-Patches/0264-Add-ArmorStand-Item-Meta.patch rename to Spigot-Server-Patches/0267-Add-ArmorStand-Item-Meta.patch index 9487d14ee7..d6abfee5d3 100644 --- a/Spigot-Server-Patches/0264-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-Server-Patches/0267-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From 0c60288376b74c282559d93fafc0ec93f14e54c7 Mon Sep 17 00:00:00 2001 +From b2a0e9a92477aef7fad217ffc07a0bb21030249d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:04:14 -0500 Subject: [PATCH] Add ArmorStand Item Meta diff --git a/Spigot-Server-Patches/0265-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0268-Extend-Player-Interact-cancellation.patch similarity index 97% rename from Spigot-Server-Patches/0265-Extend-Player-Interact-cancellation.patch rename to Spigot-Server-Patches/0268-Extend-Player-Interact-cancellation.patch index 308879848b..c99f8f175d 100644 --- a/Spigot-Server-Patches/0265-Extend-Player-Interact-cancellation.patch +++ b/Spigot-Server-Patches/0268-Extend-Player-Interact-cancellation.patch @@ -1,4 +1,4 @@ -From a4c6f19b6b2bb852891f867ca3c96bd485e4b58b Mon Sep 17 00:00:00 2001 +From 03400dce0f1bbac2abbebee1377a6deed603018c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Feb 2018 10:43:46 +0000 Subject: [PATCH] Extend Player Interact cancellation @@ -39,5 +39,5 @@ index 5ec7f5819..24f14337a 100644 ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-2867 enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS; -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0266-Optimize-Hoppers.patch b/Spigot-Server-Patches/0269-Optimize-Hoppers.patch similarity index 98% rename from Spigot-Server-Patches/0266-Optimize-Hoppers.patch rename to Spigot-Server-Patches/0269-Optimize-Hoppers.patch index 2345593a02..0cb838b098 100644 --- a/Spigot-Server-Patches/0266-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0269-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 49583f851be976702eb3b66278563d66e3285b24 Mon Sep 17 00:00:00 2001 +From 7c407762bcc2b69d4ca0e87929e1fd0913060e26 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers @@ -40,10 +40,10 @@ index fcf6bac08..3092913f5 100644 this.methodProfiler.a(() -> { return worldserver.getWorldData().getName(); diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 8e2d55a73..fe2df18df 100644 +index cc7f2069d..78ce2f8bb 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java -@@ -34,6 +34,7 @@ public abstract class TileEntity { +@@ -54,6 +54,7 @@ public abstract class TileEntity implements KeyedObject { return (MinecraftKey) TileEntity.f.b(oclass); } @@ -51,7 +51,7 @@ index 8e2d55a73..fe2df18df 100644 public World getWorld() { return this.world; } -@@ -112,6 +113,7 @@ public abstract class TileEntity { +@@ -132,6 +133,7 @@ public abstract class TileEntity implements KeyedObject { public void update() { if (this.world != null) { diff --git a/Spigot-Server-Patches/0267-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0270-Tameable-getOwnerUniqueId-API.patch similarity index 96% rename from Spigot-Server-Patches/0267-Tameable-getOwnerUniqueId-API.patch rename to Spigot-Server-Patches/0270-Tameable-getOwnerUniqueId-API.patch index ab88a669f1..4947efaa05 100644 --- a/Spigot-Server-Patches/0267-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-Server-Patches/0270-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From a5522b3c31b17b58d70663414748c0932f5f23ec Mon Sep 17 00:00:00 2001 +From 25f4cce9a4f75093d59f3dd1641aae36723e19b0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 01:14:55 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API diff --git a/Spigot-Server-Patches/0268-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0271-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 96% rename from Spigot-Server-Patches/0268-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to Spigot-Server-Patches/0271-Toggleable-player-crits-helps-mitigate-hacked-client.patch index cdab276563..11e4ae888f 100644 --- a/Spigot-Server-Patches/0268-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/Spigot-Server-Patches/0271-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -1,4 +1,4 @@ -From 147b516910174ad1413b2052ea2c76614636af89 Mon Sep 17 00:00:00 2001 +From b686cac8200d295ec51c9918f87f818868fa3ab7 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Sat, 10 Mar 2018 00:50:24 +0100 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients. diff --git a/Spigot-Server-Patches/0269-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0272-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch similarity index 95% rename from Spigot-Server-Patches/0269-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch rename to Spigot-Server-Patches/0272-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch index c3a2364338..e0a9b7a699 100644 --- a/Spigot-Server-Patches/0269-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch +++ b/Spigot-Server-Patches/0272-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch @@ -1,4 +1,4 @@ -From 2bef360d1b3d8f27bee1bd597800e2f6afc0b43d Mon Sep 17 00:00:00 2001 +From 5676d0f94137d1699144f04e16f1b34fa2ecc116 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Mar 2018 13:03:49 +0000 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened diff --git a/Spigot-Server-Patches/0270-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0273-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 96% rename from Spigot-Server-Patches/0270-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to Spigot-Server-Patches/0273-Prevent-Frosted-Ice-from-loading-holding-chunks.patch index b5b341b01a..bc40c70963 100644 --- a/Spigot-Server-Patches/0270-Prevent-Frosted-Ice-from-loading-holding-chunks.patch +++ b/Spigot-Server-Patches/0273-Prevent-Frosted-Ice-from-loading-holding-chunks.patch @@ -1,4 +1,4 @@ -From f85b94a3c719ead513133dfa1f9d26e8f167a979 Mon Sep 17 00:00:00 2001 +From 5a88cdc6665f7185634f9938f1406e6709ba4b48 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Mar 2018 16:33:15 -0500 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks diff --git a/Spigot-Server-Patches/0271-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0274-Disable-Explicit-Network-Manager-Flushing.patch similarity index 96% rename from Spigot-Server-Patches/0271-Disable-Explicit-Network-Manager-Flushing.patch rename to Spigot-Server-Patches/0274-Disable-Explicit-Network-Manager-Flushing.patch index ca13f9a03b..aa05e40dc8 100644 --- a/Spigot-Server-Patches/0271-Disable-Explicit-Network-Manager-Flushing.patch +++ b/Spigot-Server-Patches/0274-Disable-Explicit-Network-Manager-Flushing.patch @@ -1,4 +1,4 @@ -From f3ae87325bc373a347097bc2713716ea63926076 Mon Sep 17 00:00:00 2001 +From c774215f627fd1de37b36e0ddf37bfb2514419ab Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 11 Mar 2018 14:13:33 -0400 Subject: [PATCH] Disable Explicit Network Manager Flushing diff --git a/Spigot-Server-Patches/0272-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0275-Implement-extended-PaperServerListPingEvent.patch similarity index 99% rename from Spigot-Server-Patches/0272-Implement-extended-PaperServerListPingEvent.patch rename to Spigot-Server-Patches/0275-Implement-extended-PaperServerListPingEvent.patch index efd1d31449..3767163564 100644 --- a/Spigot-Server-Patches/0272-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0275-Implement-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 396d97163d2b62c0e04684cc4f00bc928c3403b8 Mon Sep 17 00:00:00 2001 +From 25ff513d84565b3f16325cd6e338d2837fcad079 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent diff --git a/Spigot-Server-Patches/0273-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0276-Improved-Async-Task-Scheduler.patch similarity index 99% rename from Spigot-Server-Patches/0273-Improved-Async-Task-Scheduler.patch rename to Spigot-Server-Patches/0276-Improved-Async-Task-Scheduler.patch index 4c26391540..e696da60d3 100644 --- a/Spigot-Server-Patches/0273-Improved-Async-Task-Scheduler.patch +++ b/Spigot-Server-Patches/0276-Improved-Async-Task-Scheduler.patch @@ -1,4 +1,4 @@ -From 4b7fecc2832189ba7a4dd7efbe707ad05eaee78b Mon Sep 17 00:00:00 2001 +From 433c2829dede94f23af5de8fa6ceb5481d3196a9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Mar 2018 22:59:43 -0400 Subject: [PATCH] Improved Async Task Scheduler diff --git a/Spigot-Server-Patches/0274-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0277-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 97% rename from Spigot-Server-Patches/0274-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to Spigot-Server-Patches/0277-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 393b11d58d..d2182969a3 100644 --- a/Spigot-Server-Patches/0274-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-Server-Patches/0277-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From 45594184b96f90922bca7d7239d69d4816292892 Mon Sep 17 00:00:00 2001 +From 817b481e30e24f5323278304bde07985a9d5adf2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:45:57 -0400 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent diff --git a/Spigot-Server-Patches/0275-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0278-Call-PortalCreateEvent-for-exit-portals.patch similarity index 98% rename from Spigot-Server-Patches/0275-Call-PortalCreateEvent-for-exit-portals.patch rename to Spigot-Server-Patches/0278-Call-PortalCreateEvent-for-exit-portals.patch index 213c4d1f46..3e9c8839c4 100644 --- a/Spigot-Server-Patches/0275-Call-PortalCreateEvent-for-exit-portals.patch +++ b/Spigot-Server-Patches/0278-Call-PortalCreateEvent-for-exit-portals.patch @@ -1,4 +1,4 @@ -From c79dab589c018cfc9b63461e23e4ccc707d0c0e8 Mon Sep 17 00:00:00 2001 +From 8122b5281bcc841d9eb9d5b53cef8a34adc69fd7 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Sun, 18 Mar 2018 15:44:44 +0100 Subject: [PATCH] Call PortalCreateEvent for exit portals diff --git a/Spigot-Server-Patches/0276-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0279-Player.setPlayerProfile-API.patch similarity index 98% rename from Spigot-Server-Patches/0276-Player.setPlayerProfile-API.patch rename to Spigot-Server-Patches/0279-Player.setPlayerProfile-API.patch index 8dafb52ae7..abe05413fe 100644 --- a/Spigot-Server-Patches/0276-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0279-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 33a45aa43f76853f353a03b269a95c684da281a9 Mon Sep 17 00:00:00 2001 +From fedca7db912caed91d4ddd73f7a4e994cb1b12b1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:29:48 -0400 Subject: [PATCH] Player.setPlayerProfile API diff --git a/Spigot-Server-Patches/0277-Configurable-Unrestricted-Signs.patch b/Spigot-Server-Patches/0280-Configurable-Unrestricted-Signs.patch similarity index 98% rename from Spigot-Server-Patches/0277-Configurable-Unrestricted-Signs.patch rename to Spigot-Server-Patches/0280-Configurable-Unrestricted-Signs.patch index e79ba5956b..3fc4d862d8 100644 --- a/Spigot-Server-Patches/0277-Configurable-Unrestricted-Signs.patch +++ b/Spigot-Server-Patches/0280-Configurable-Unrestricted-Signs.patch @@ -1,4 +1,4 @@ -From 469e635779a9a40bbcc3403c30d3cc828af7bf27 Mon Sep 17 00:00:00 2001 +From cbe35161f2e8a59c22aca9a0d5412674d128df41 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Mar 2018 19:57:10 -0400 Subject: [PATCH] Configurable Unrestricted Signs diff --git a/Spigot-Server-Patches/0278-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0281-Fix-Dragon-Server-Crashes.patch similarity index 95% rename from Spigot-Server-Patches/0278-Fix-Dragon-Server-Crashes.patch rename to Spigot-Server-Patches/0281-Fix-Dragon-Server-Crashes.patch index 3a23d21f2f..572e40dadf 100644 --- a/Spigot-Server-Patches/0278-Fix-Dragon-Server-Crashes.patch +++ b/Spigot-Server-Patches/0281-Fix-Dragon-Server-Crashes.patch @@ -1,4 +1,4 @@ -From aeccf3dbd64f77d7266d3015f0dd0d7954786fdd Mon Sep 17 00:00:00 2001 +From a98fa1d1bf527e9056477711ad1e3bfef9e5b7b2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Mar 2018 20:52:07 -0400 Subject: [PATCH] Fix Dragon Server Crashes diff --git a/Spigot-Server-Patches/0279-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0282-getPlayerUniqueId-API.patch similarity index 96% rename from Spigot-Server-Patches/0279-getPlayerUniqueId-API.patch rename to Spigot-Server-Patches/0282-getPlayerUniqueId-API.patch index 59f1b24d60..940ffff598 100644 --- a/Spigot-Server-Patches/0279-getPlayerUniqueId-API.patch +++ b/Spigot-Server-Patches/0282-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 4d634e80f859fa10b307b63ce84d7903ec8fed59 Mon Sep 17 00:00:00 2001 +From 9e931d8f67acf7dd52c07c52967e54a8ce685e81 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:40:24 -0400 Subject: [PATCH] getPlayerUniqueId API diff --git a/Spigot-Server-Patches/0280-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0283-Make-player-data-saving-configurable.patch similarity index 96% rename from Spigot-Server-Patches/0280-Make-player-data-saving-configurable.patch rename to Spigot-Server-Patches/0283-Make-player-data-saving-configurable.patch index 1ee6a19fc9..179024a00b 100644 --- a/Spigot-Server-Patches/0280-Make-player-data-saving-configurable.patch +++ b/Spigot-Server-Patches/0283-Make-player-data-saving-configurable.patch @@ -1,4 +1,4 @@ -From d9a13f8dca9c5a0406fa74b41038bfb5fb6339b8 Mon Sep 17 00:00:00 2001 +From 392108a766bc09e0cbc5232bda2e91e63a877aa1 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 26 Mar 2018 18:30:53 +0300 Subject: [PATCH] Make player data saving configurable diff --git a/Spigot-Server-Patches/0281-Make-the-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0284-Make-the-legacy-ping-handler-more-reliable.patch similarity index 98% rename from Spigot-Server-Patches/0281-Make-the-legacy-ping-handler-more-reliable.patch rename to Spigot-Server-Patches/0284-Make-the-legacy-ping-handler-more-reliable.patch index 12ce032f8a..7d4aef2685 100644 --- a/Spigot-Server-Patches/0281-Make-the-legacy-ping-handler-more-reliable.patch +++ b/Spigot-Server-Patches/0284-Make-the-legacy-ping-handler-more-reliable.patch @@ -1,4 +1,4 @@ -From 414e39cc2aa1d2ec4cd145c42fc78a446cc6d984 Mon Sep 17 00:00:00 2001 +From e24f4a9cce13be40d11613acdfa591bcaa64fdd2 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 18:22:50 +0200 Subject: [PATCH] Make the legacy ping handler more reliable diff --git a/Spigot-Server-Patches/0282-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0285-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 99% rename from Spigot-Server-Patches/0282-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to Spigot-Server-Patches/0285-Call-PaperServerListPingEvent-for-legacy-pings.patch index b4c72c57ed..d95b3a260b 100644 --- a/Spigot-Server-Patches/0282-Call-PaperServerListPingEvent-for-legacy-pings.patch +++ b/Spigot-Server-Patches/0285-Call-PaperServerListPingEvent-for-legacy-pings.patch @@ -1,4 +1,4 @@ -From 4410aed47a8119f458eb15da78b2fb644881cd17 Mon Sep 17 00:00:00 2001 +From 93caa0bf416f61fe9f92a45a4631900b78e939dc Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:51 +0200 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings diff --git a/Spigot-Server-Patches/0283-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0286-Flag-to-disable-the-channel-limit.patch similarity index 96% rename from Spigot-Server-Patches/0283-Flag-to-disable-the-channel-limit.patch rename to Spigot-Server-Patches/0286-Flag-to-disable-the-channel-limit.patch index 9aef329849..3f5bb6f0e5 100644 --- a/Spigot-Server-Patches/0283-Flag-to-disable-the-channel-limit.patch +++ b/Spigot-Server-Patches/0286-Flag-to-disable-the-channel-limit.patch @@ -1,4 +1,4 @@ -From 714b94695d27c70d0c293d3e4ad5d623f2924e44 Mon Sep 17 00:00:00 2001 +From 826c03435f0d281d8f6850e7db2ab9b2a225f10c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 31 Mar 2018 17:04:26 +0100 Subject: [PATCH] Flag to disable the channel limit diff --git a/Spigot-Server-Patches/0284-MC-124833.patch b/Spigot-Server-Patches/0287-MC-124833.patch similarity index 94% rename from Spigot-Server-Patches/0284-MC-124833.patch rename to Spigot-Server-Patches/0287-MC-124833.patch index e7ebb5a7a6..247471650b 100644 --- a/Spigot-Server-Patches/0284-MC-124833.patch +++ b/Spigot-Server-Patches/0287-MC-124833.patch @@ -1,4 +1,4 @@ -From 36e9ce39e1d8b400429841d897708bb00498127f Mon Sep 17 00:00:00 2001 +From 938eb8913fdbb1ba1e093cc56a26bfcf43ca57ce Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 4 Apr 2018 21:00:43 -0400 Subject: [PATCH] MC-124833 diff --git a/Spigot-Server-Patches/0285-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0288-Add-method-to-open-already-placed-sign.patch similarity index 95% rename from Spigot-Server-Patches/0285-Add-method-to-open-already-placed-sign.patch rename to Spigot-Server-Patches/0288-Add-method-to-open-already-placed-sign.patch index 94f3f94165..aca999ea23 100644 --- a/Spigot-Server-Patches/0285-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-Server-Patches/0288-Add-method-to-open-already-placed-sign.patch @@ -1,4 +1,4 @@ -From 841320b5032e39463ad433686abf91824b33aa13 Mon Sep 17 00:00:00 2001 +From 109b24e9f12f5bfdc5f0a4608078b71b2acf0c40 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 1 Apr 2018 02:29:37 +0300 Subject: [PATCH] Add method to open already placed sign diff --git a/Spigot-Server-Patches/0286-Load-version-history-at-server-start.patch b/Spigot-Server-Patches/0289-Load-version-history-at-server-start.patch similarity index 93% rename from Spigot-Server-Patches/0286-Load-version-history-at-server-start.patch rename to Spigot-Server-Patches/0289-Load-version-history-at-server-start.patch index 39f74b6980..8b7985d677 100644 --- a/Spigot-Server-Patches/0286-Load-version-history-at-server-start.patch +++ b/Spigot-Server-Patches/0289-Load-version-history-at-server-start.patch @@ -1,4 +1,4 @@ -From 746d4e30806073d5988e5227c8c3e4baf8e5824f Mon Sep 17 00:00:00 2001 +From d308df8c419762a2bef93e351ecded6ff14bbcce Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Thu, 1 Mar 2018 19:38:14 -0600 Subject: [PATCH] Load version history at server start diff --git a/Spigot-Server-Patches/0287-Handle-bad-chunks-more-gracefully.patch b/Spigot-Server-Patches/0290-Handle-bad-chunks-more-gracefully.patch similarity index 97% rename from Spigot-Server-Patches/0287-Handle-bad-chunks-more-gracefully.patch rename to Spigot-Server-Patches/0290-Handle-bad-chunks-more-gracefully.patch index b33f6e750d..57a94aa2eb 100644 --- a/Spigot-Server-Patches/0287-Handle-bad-chunks-more-gracefully.patch +++ b/Spigot-Server-Patches/0290-Handle-bad-chunks-more-gracefully.patch @@ -1,4 +1,4 @@ -From b109748c82366091cedff693b08fc989943af53f Mon Sep 17 00:00:00 2001 +From 6ed3ea16d5ae3197d4539bc110fcc9610b7e9888 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 17 Apr 2018 21:26:31 -0400 Subject: [PATCH] Handle bad chunks more gracefully diff --git a/Spigot-Server-Patches/0288-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0291-Configurable-sprint-interruption-on-attack.patch similarity index 96% rename from Spigot-Server-Patches/0288-Configurable-sprint-interruption-on-attack.patch rename to Spigot-Server-Patches/0291-Configurable-sprint-interruption-on-attack.patch index 8570ccbae9..90baf6f60b 100644 --- a/Spigot-Server-Patches/0288-Configurable-sprint-interruption-on-attack.patch +++ b/Spigot-Server-Patches/0291-Configurable-sprint-interruption-on-attack.patch @@ -1,4 +1,4 @@ -From 5d096e89939df84db8b2a58b436a538d082fb52a Mon Sep 17 00:00:00 2001 +From 61350e5dcf4f5833c142aadaba0fb41f27056974 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sat, 14 Apr 2018 20:20:46 +0200 Subject: [PATCH] Configurable sprint interruption on attack diff --git a/Spigot-Server-Patches/0289-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch b/Spigot-Server-Patches/0292-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch similarity index 96% rename from Spigot-Server-Patches/0289-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch rename to Spigot-Server-Patches/0292-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch index 84e3da5209..5c6925a575 100644 --- a/Spigot-Server-Patches/0289-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch +++ b/Spigot-Server-Patches/0292-Configurable-Allowance-of-Permanent-Chunk-Loaders.patch @@ -1,4 +1,4 @@ -From ae8090cca9c376e49986204021750f75d0b1e7d3 Mon Sep 17 00:00:00 2001 +From b3c4cbe3e4019d14276d36954449d2d91825336a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Apr 2018 11:21:48 -0400 Subject: [PATCH] Configurable Allowance of Permanent Chunk Loaders diff --git a/Spigot-Server-Patches/0290-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0293-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 94% rename from Spigot-Server-Patches/0290-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to Spigot-Server-Patches/0293-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index 69751027a2..9a0ea33c0a 100644 --- a/Spigot-Server-Patches/0290-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/Spigot-Server-Patches/0293-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -1,4 +1,4 @@ -From 133271df1c5d0f9cccc880a70d733a173459c68c Mon Sep 17 00:00:00 2001 +From b8dcd729a086f1323e3237cfbe207146d18e53fd Mon Sep 17 00:00:00 2001 From: 0x22 <0x22@futureclient.net> Date: Thu, 26 Apr 2018 04:41:11 -0400 Subject: [PATCH] Fix exploit that allowed colored signs to be created diff --git a/Spigot-Server-Patches/0291-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0294-EndermanEscapeEvent.patch similarity index 98% rename from Spigot-Server-Patches/0291-EndermanEscapeEvent.patch rename to Spigot-Server-Patches/0294-EndermanEscapeEvent.patch index f4c071f7a4..2d9f7a447e 100644 --- a/Spigot-Server-Patches/0291-EndermanEscapeEvent.patch +++ b/Spigot-Server-Patches/0294-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From 62283507f331115942bc0e812186a79322de7f6f Mon Sep 17 00:00:00 2001 +From a29a10be54631b0f9e7b99f343dc3d22b726c3d9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:15:55 -0400 Subject: [PATCH] EndermanEscapeEvent diff --git a/Spigot-Server-Patches/0292-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0295-Enderman.teleportRandomly.patch similarity index 96% rename from Spigot-Server-Patches/0292-Enderman.teleportRandomly.patch rename to Spigot-Server-Patches/0295-Enderman.teleportRandomly.patch index 0e050fc2bd..3a545d4e6e 100644 --- a/Spigot-Server-Patches/0292-Enderman.teleportRandomly.patch +++ b/Spigot-Server-Patches/0295-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From 254f29c68106283c645c9a8a8142fe261166f7e5 Mon Sep 17 00:00:00 2001 +From 4c67ba92848e31471481b803433a1210d5f6f222 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:44 -0400 Subject: [PATCH] Enderman.teleportRandomly() diff --git a/Spigot-Server-Patches/0293-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0296-Block-Enderpearl-Travel-Exploit.patch similarity index 97% rename from Spigot-Server-Patches/0293-Block-Enderpearl-Travel-Exploit.patch rename to Spigot-Server-Patches/0296-Block-Enderpearl-Travel-Exploit.patch index a0754952b4..58df20cc5b 100644 --- a/Spigot-Server-Patches/0293-Block-Enderpearl-Travel-Exploit.patch +++ b/Spigot-Server-Patches/0296-Block-Enderpearl-Travel-Exploit.patch @@ -1,4 +1,4 @@ -From 905de1056b56b89387ff40bdfa7ff1fb970f5979 Mon Sep 17 00:00:00 2001 +From da411565a450dfde5e88a3a952b09b3c6f182340 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 17:15:26 -0400 Subject: [PATCH] Block Enderpearl Travel Exploit diff --git a/Spigot-Server-Patches/0294-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0297-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 98% rename from Spigot-Server-Patches/0294-Expand-World.spawnParticle-API-and-add-Builder.patch rename to Spigot-Server-Patches/0297-Expand-World.spawnParticle-API-and-add-Builder.patch index f3dee938da..1e7a082a20 100644 --- a/Spigot-Server-Patches/0294-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0297-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 7867cd96c0c87f5bac30a86077f260fc1dd8a4ea Mon Sep 17 00:00:00 2001 +From d1902f093f9e9e05aa983daa6f46cf1c06269faa Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 15 Aug 2017 22:29:12 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder diff --git a/Spigot-Server-Patches/0295-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0298-EndermanAttackPlayerEvent.patch similarity index 95% rename from Spigot-Server-Patches/0295-EndermanAttackPlayerEvent.patch rename to Spigot-Server-Patches/0298-EndermanAttackPlayerEvent.patch index dd48ba92a8..8816b5921a 100644 --- a/Spigot-Server-Patches/0295-EndermanAttackPlayerEvent.patch +++ b/Spigot-Server-Patches/0298-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From c4287ff854c237cfdb24c2916d48a2fb466d96c3 Mon Sep 17 00:00:00 2001 +From c21ae9b442a22278ea808e3aca2ce55db5e3b4e2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:18:54 -0400 Subject: [PATCH] EndermanAttackPlayerEvent diff --git a/Spigot-Server-Patches/0296-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0299-WitchConsumePotionEvent.patch similarity index 95% rename from Spigot-Server-Patches/0296-WitchConsumePotionEvent.patch rename to Spigot-Server-Patches/0299-WitchConsumePotionEvent.patch index 3b090094e0..4960cbbd93 100644 --- a/Spigot-Server-Patches/0296-WitchConsumePotionEvent.patch +++ b/Spigot-Server-Patches/0299-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From 0ac0977059b0e69fd5b9c30a6829727c1d846a43 Mon Sep 17 00:00:00 2001 +From fecfe061f41f0aaced5637ec3813aac206c4bbfc Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:35:16 -0400 Subject: [PATCH] WitchConsumePotionEvent diff --git a/Spigot-Server-Patches/0297-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0300-WitchThrowPotionEvent.patch similarity index 96% rename from Spigot-Server-Patches/0297-WitchThrowPotionEvent.patch rename to Spigot-Server-Patches/0300-WitchThrowPotionEvent.patch index dfd4cd8307..c2d9f3ae9a 100644 --- a/Spigot-Server-Patches/0297-WitchThrowPotionEvent.patch +++ b/Spigot-Server-Patches/0300-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 9c93ec1eba8ee007df7a80f5e39c94c720511ea8 Mon Sep 17 00:00:00 2001 +From f74306caa08b873b6451ea83f6266b636f92a846 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:44:58 -0400 Subject: [PATCH] WitchThrowPotionEvent diff --git a/Spigot-Server-Patches/0298-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0301-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 95% rename from Spigot-Server-Patches/0298-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to Spigot-Server-Patches/0301-Allow-spawning-Item-entities-with-World.spawnEntity.patch index 357d9f4ede..468ab50d67 100644 --- a/Spigot-Server-Patches/0298-Allow-spawning-Item-entities-with-World.spawnEntity.patch +++ b/Spigot-Server-Patches/0301-Allow-spawning-Item-entities-with-World.spawnEntity.patch @@ -1,4 +1,4 @@ -From 8a3bbe4ab353216233fecd288d92cbc72ac1188f Mon Sep 17 00:00:00 2001 +From 4bc77441489cc2558b2ce88fa55a8ba6f424f4c5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Jun 2018 20:39:20 -0400 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity diff --git a/Spigot-Server-Patches/0299-Don-t-load-chunks-for-villager-door-checks.patch b/Spigot-Server-Patches/0302-Don-t-load-chunks-for-villager-door-checks.patch similarity index 96% rename from Spigot-Server-Patches/0299-Don-t-load-chunks-for-villager-door-checks.patch rename to Spigot-Server-Patches/0302-Don-t-load-chunks-for-villager-door-checks.patch index 2e10480d88..2f11cdaf7c 100644 --- a/Spigot-Server-Patches/0299-Don-t-load-chunks-for-villager-door-checks.patch +++ b/Spigot-Server-Patches/0302-Don-t-load-chunks-for-villager-door-checks.patch @@ -1,4 +1,4 @@ -From 86f3cd80c00f7fa9729c79ce9591fa1d3c3a44e6 Mon Sep 17 00:00:00 2001 +From d6a8a38833e30365423d53a34ce66c467f13c403 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 00:32:22 -0400 Subject: [PATCH] Don't load chunks for villager door checks diff --git a/Spigot-Server-Patches/0300-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0303-WitchReadyPotionEvent.patch similarity index 95% rename from Spigot-Server-Patches/0300-WitchReadyPotionEvent.patch rename to Spigot-Server-Patches/0303-WitchReadyPotionEvent.patch index 443a3e5afc..c9295402c2 100644 --- a/Spigot-Server-Patches/0300-WitchReadyPotionEvent.patch +++ b/Spigot-Server-Patches/0303-WitchReadyPotionEvent.patch @@ -1,4 +1,4 @@ -From 9c8a443bd16d12e35e96931e865678b6e836a316 Mon Sep 17 00:00:00 2001 +From 9b2c59ff0e6e55277a90fb849e165628e655b557 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:26 -0400 Subject: [PATCH] WitchReadyPotionEvent diff --git a/Spigot-Server-Patches/0301-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0304-ItemStack-getMaxItemUseDuration.patch similarity index 96% rename from Spigot-Server-Patches/0301-ItemStack-getMaxItemUseDuration.patch rename to Spigot-Server-Patches/0304-ItemStack-getMaxItemUseDuration.patch index 046aa9bf97..9a070ba57e 100644 --- a/Spigot-Server-Patches/0301-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-Server-Patches/0304-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From 8ea65950d9b4d8df5c2010024735ca8e1b810d87 Mon Sep 17 00:00:00 2001 +From addea0ca53003e381887f658b0a8bbd823c8c921 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 23:00:29 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration diff --git a/Spigot-Server-Patches/0302-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0305-Implement-EntityTeleportEndGatewayEvent.patch similarity index 96% rename from Spigot-Server-Patches/0302-Implement-EntityTeleportEndGatewayEvent.patch rename to Spigot-Server-Patches/0305-Implement-EntityTeleportEndGatewayEvent.patch index 54c12cfabc..843effba6a 100644 --- a/Spigot-Server-Patches/0302-Implement-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0305-Implement-EntityTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 9996b666f6e907c564146779357ce22a4ac63434 Mon Sep 17 00:00:00 2001 +From 9c9d717e44fe7c7f4eb708505ce8efde66b5902c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 14:08:39 +0200 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent diff --git a/Spigot-Server-Patches/0303-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0306-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 95% rename from Spigot-Server-Patches/0303-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to Spigot-Server-Patches/0306-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch index b425be0220..406f12a7ba 100644 --- a/Spigot-Server-Patches/0303-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch +++ b/Spigot-Server-Patches/0306-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch @@ -1,4 +1,4 @@ -From 59229f9f6883b137fa2f63aa3e4cb239c607fb83 Mon Sep 17 00:00:00 2001 +From 1509b59adc8a4d13fa996e12d2cd82db842edaa5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 01:18:49 -0400 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event diff --git a/Spigot-Server-Patches/0304-Properly-remove-entities-on-dimension-teleport.patch b/Spigot-Server-Patches/0307-Properly-remove-entities-on-dimension-teleport.patch similarity index 91% rename from Spigot-Server-Patches/0304-Properly-remove-entities-on-dimension-teleport.patch rename to Spigot-Server-Patches/0307-Properly-remove-entities-on-dimension-teleport.patch index 5e9f1c285a..45bf1a53aa 100644 --- a/Spigot-Server-Patches/0304-Properly-remove-entities-on-dimension-teleport.patch +++ b/Spigot-Server-Patches/0307-Properly-remove-entities-on-dimension-teleport.patch @@ -1,4 +1,4 @@ -From 37c64784b97f49c37e278266605057cdddb6642d Mon Sep 17 00:00:00 2001 +From f1e9152d385aad3dee238c0d2bb920216be1f6d0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 20:04:42 -0400 Subject: [PATCH] Properly remove entities on dimension teleport @@ -22,10 +22,10 @@ requirement, but plugins (such as my own) use this method to trigger a "reload" of the entity on the client. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 58fe1aa3e..4431f6e99 100644 +index 00791faf2..70641d479 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2405,7 +2405,7 @@ public abstract class Entity implements ICommandListener { +@@ -2424,7 +2424,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper } // CraftBukkit end */ diff --git a/Spigot-Server-Patches/0305-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0308-Fix-CraftEntity-hashCode.patch similarity index 91% rename from Spigot-Server-Patches/0305-Fix-CraftEntity-hashCode.patch rename to Spigot-Server-Patches/0308-Fix-CraftEntity-hashCode.patch index eeb273d3bf..efdbe82a13 100644 --- a/Spigot-Server-Patches/0305-Fix-CraftEntity-hashCode.patch +++ b/Spigot-Server-Patches/0308-Fix-CraftEntity-hashCode.patch @@ -1,4 +1,4 @@ -From 8d7875bba43bd5bab68aa8732e6260959dce1f7c Mon Sep 17 00:00:00 2001 +From 1918db5df9aff0309e3d25610f655a31c2cac838 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 20:20:15 -0400 Subject: [PATCH] Fix CraftEntity hashCode @@ -21,10 +21,10 @@ check is essentially the same as this.getHandle() == other.getHandle() However, replaced it too to make it clearer of intent. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 1571e4eb5..22a1a4965 100644 +index bf7e6ed3f..47edc0494 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -503,14 +503,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -510,14 +510,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return false; } final CraftEntity other = (CraftEntity) obj; diff --git a/Spigot-Server-Patches/0306-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0309-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 98% rename from Spigot-Server-Patches/0306-Configurable-Alternative-LootPool-Luck-Formula.patch rename to Spigot-Server-Patches/0309-Configurable-Alternative-LootPool-Luck-Formula.patch index 472c06c0f7..d69a4297e2 100644 --- a/Spigot-Server-Patches/0306-Configurable-Alternative-LootPool-Luck-Formula.patch +++ b/Spigot-Server-Patches/0309-Configurable-Alternative-LootPool-Luck-Formula.patch @@ -1,4 +1,4 @@ -From 2870f8b28bc0f49e82b9269b24aadb7c4ad29403 Mon Sep 17 00:00:00 2001 +From 344d6a6d7a9064a574630afb79761a5f9fe55811 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Jun 2018 00:30:32 -0400 Subject: [PATCH] Configurable Alternative LootPool Luck Formula diff --git a/Spigot-Server-Patches/0307-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0310-Print-Error-details-when-failing-to-save-player-data.patch similarity index 92% rename from Spigot-Server-Patches/0307-Print-Error-details-when-failing-to-save-player-data.patch rename to Spigot-Server-Patches/0310-Print-Error-details-when-failing-to-save-player-data.patch index 6da131dd5f..8413f33bdc 100644 --- a/Spigot-Server-Patches/0307-Print-Error-details-when-failing-to-save-player-data.patch +++ b/Spigot-Server-Patches/0310-Print-Error-details-when-failing-to-save-player-data.patch @@ -1,4 +1,4 @@ -From a6d2f167537708d9da83cf844106814128885259 Mon Sep 17 00:00:00 2001 +From 2948ef6de198c4a1fb763df1d5590c77a3dc0128 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Jun 2018 20:37:03 -0400 Subject: [PATCH] Print Error details when failing to save player data diff --git a/Spigot-Server-Patches/0308-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0311-Make-shield-blocking-delay-configurable.patch similarity index 97% rename from Spigot-Server-Patches/0308-Make-shield-blocking-delay-configurable.patch rename to Spigot-Server-Patches/0311-Make-shield-blocking-delay-configurable.patch index a8762c45a8..13087b6191 100644 --- a/Spigot-Server-Patches/0308-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-Server-Patches/0311-Make-shield-blocking-delay-configurable.patch @@ -1,4 +1,4 @@ -From 06d831010a16e6244409d222fc86f1f5738077da Mon Sep 17 00:00:00 2001 +From 29599c88d5f36c9ade555f7a6d7890cc78c126f1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:18:16 -0500 Subject: [PATCH] Make shield blocking delay configurable diff --git a/Spigot-Server-Patches/0309-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0312-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch similarity index 96% rename from Spigot-Server-Patches/0309-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch rename to Spigot-Server-Patches/0312-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch index 1cd306692f..c88299614a 100644 --- a/Spigot-Server-Patches/0309-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch +++ b/Spigot-Server-Patches/0312-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch @@ -1,4 +1,4 @@ -From 9f81bd0698b9f2060806858c829ddf07f37fbe29 Mon Sep 17 00:00:00 2001 +From 34db39b1a0906f9fce82f2970d924b95289a4bc7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Jun 2018 16:23:38 -0400 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors diff --git a/Spigot-Server-Patches/0310-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0313-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch similarity index 98% rename from Spigot-Server-Patches/0310-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch rename to Spigot-Server-Patches/0313-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index 6539d83e77..44f299efb7 100644 --- a/Spigot-Server-Patches/0310-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-Server-Patches/0313-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From 633dbf5174ecd2ea261dbf0a3709068a3ec87180 Mon Sep 17 00:00:00 2001 +From 1d8b96b5181f2c507c7022b773c8fcf384f065e4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:51:17 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API diff --git a/Spigot-Server-Patches/0311-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0314-PlayerReadyArrowEvent.patch similarity index 98% rename from Spigot-Server-Patches/0311-PlayerReadyArrowEvent.patch rename to Spigot-Server-Patches/0314-PlayerReadyArrowEvent.patch index 5da7a24f4d..83e1272956 100644 --- a/Spigot-Server-Patches/0311-PlayerReadyArrowEvent.patch +++ b/Spigot-Server-Patches/0314-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From c5616376719b637a47b3c51bb5642068fadacef3 Mon Sep 17 00:00:00 2001 +From dd4eb3f1e29bd1c58e58a7cc75e02bd284c11938 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:12:53 -0400 Subject: [PATCH] PlayerReadyArrowEvent diff --git a/Spigot-Server-Patches/0312-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0315-Fire-EntityShootBowEvent-for-Illusioner.patch similarity index 95% rename from Spigot-Server-Patches/0312-Fire-EntityShootBowEvent-for-Illusioner.patch rename to Spigot-Server-Patches/0315-Fire-EntityShootBowEvent-for-Illusioner.patch index 65ecc01ddd..06c03bf07a 100644 --- a/Spigot-Server-Patches/0312-Fire-EntityShootBowEvent-for-Illusioner.patch +++ b/Spigot-Server-Patches/0315-Fire-EntityShootBowEvent-for-Illusioner.patch @@ -1,4 +1,4 @@ -From 84763ee9c003c8c59f1d2837ea35be85e0a4e085 Mon Sep 17 00:00:00 2001 +From 81e31ca23b57f80911c332ec7fe349b793807ff7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 22:19:36 -0400 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner diff --git a/Spigot-Server-Patches/0313-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0316-Implement-EntityKnockbackByEntityEvent.patch similarity index 96% rename from Spigot-Server-Patches/0313-Implement-EntityKnockbackByEntityEvent.patch rename to Spigot-Server-Patches/0316-Implement-EntityKnockbackByEntityEvent.patch index d6205c6476..48da86b61b 100644 --- a/Spigot-Server-Patches/0313-Implement-EntityKnockbackByEntityEvent.patch +++ b/Spigot-Server-Patches/0316-Implement-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From ea48866f00f5741865ee3aa7d770ef33d5759e73 Mon Sep 17 00:00:00 2001 +From ac9417f28697dc1441c73a1580541752f9dea2c3 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:46:23 +0200 Subject: [PATCH] Implement EntityKnockbackByEntityEvent diff --git a/Spigot-Server-Patches/0314-Expand-Explosions-API.patch b/Spigot-Server-Patches/0317-Expand-Explosions-API.patch similarity index 95% rename from Spigot-Server-Patches/0314-Expand-Explosions-API.patch rename to Spigot-Server-Patches/0317-Expand-Explosions-API.patch index 37292b7f75..79a7f27ea9 100644 --- a/Spigot-Server-Patches/0314-Expand-Explosions-API.patch +++ b/Spigot-Server-Patches/0317-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From a9510224625307f352a67679df732598e83cbae9 Mon Sep 17 00:00:00 2001 +From 20e4111eafc2445a21fcfea8cee7670cf559ad23 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Jun 2018 23:17:24 -0400 Subject: [PATCH] Expand Explosions API diff --git a/Spigot-Server-Patches/0315-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0318-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 96% rename from Spigot-Server-Patches/0315-LivingEntity-Hand-Raised-Item-Use-API.patch rename to Spigot-Server-Patches/0318-LivingEntity-Hand-Raised-Item-Use-API.patch index b95db6f831..0943993159 100644 --- a/Spigot-Server-Patches/0315-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-Server-Patches/0318-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From 9f02fc6f591f197d9531a73fc2148cac720c6fef Mon Sep 17 00:00:00 2001 +From 14736699b8f04a3ba9fe7e1ded6ab047a0e9cb4d Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:21:28 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API diff --git a/Spigot-Server-Patches/0316-RangedEntity-API.patch b/Spigot-Server-Patches/0319-RangedEntity-API.patch similarity index 99% rename from Spigot-Server-Patches/0316-RangedEntity-API.patch rename to Spigot-Server-Patches/0319-RangedEntity-API.patch index 209530c14b..ee741aea45 100644 --- a/Spigot-Server-Patches/0316-RangedEntity-API.patch +++ b/Spigot-Server-Patches/0319-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 310a55346fb4c29c0c78c44e4766086166d16c3c Mon Sep 17 00:00:00 2001 +From 52f2f41cf15f8c3bb9903e8e97692a3d903b6a1c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 22:00:49 -0400 Subject: [PATCH] RangedEntity API diff --git a/Spigot-Server-Patches/0317-Add-SentientNPC-Interface-to-Entities.patch b/Spigot-Server-Patches/0320-Add-SentientNPC-Interface-to-Entities.patch similarity index 99% rename from Spigot-Server-Patches/0317-Add-SentientNPC-Interface-to-Entities.patch rename to Spigot-Server-Patches/0320-Add-SentientNPC-Interface-to-Entities.patch index b62f8cc5a2..570f05bf04 100644 --- a/Spigot-Server-Patches/0317-Add-SentientNPC-Interface-to-Entities.patch +++ b/Spigot-Server-Patches/0320-Add-SentientNPC-Interface-to-Entities.patch @@ -1,4 +1,4 @@ -From 0223979f949bc54a2fcb253b08213d3b4d0458fb Mon Sep 17 00:00:00 2001 +From 5c342142d7b1abdbce2e22f61a6bcf1cdda3e2e4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 Jul 2018 22:06:29 -0400 Subject: [PATCH] Add SentientNPC Interface to Entities diff --git a/Spigot-Server-Patches/0318-Cleanup-allocated-favicon-ByteBuf.patch b/Spigot-Server-Patches/0321-Cleanup-allocated-favicon-ByteBuf.patch similarity index 96% rename from Spigot-Server-Patches/0318-Cleanup-allocated-favicon-ByteBuf.patch rename to Spigot-Server-Patches/0321-Cleanup-allocated-favicon-ByteBuf.patch index e57cc05d3a..f0393338df 100644 --- a/Spigot-Server-Patches/0318-Cleanup-allocated-favicon-ByteBuf.patch +++ b/Spigot-Server-Patches/0321-Cleanup-allocated-favicon-ByteBuf.patch @@ -1,4 +1,4 @@ -From bb2607ef12aebead5c261dc647acbc233def762a Mon Sep 17 00:00:00 2001 +From b42d9cfdd497370e9fe6d0b2b684ebcd6fe28ffd Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 3 Jul 2018 19:14:38 +0100 Subject: [PATCH] Cleanup allocated favicon ByteBuf @@ -39,5 +39,5 @@ index f82e22b23..0399a48e1 100644 } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0319-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch b/Spigot-Server-Patches/0322-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch similarity index 94% rename from Spigot-Server-Patches/0319-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch rename to Spigot-Server-Patches/0322-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch index 9dfebb70c2..419bd9d90f 100644 --- a/Spigot-Server-Patches/0319-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch +++ b/Spigot-Server-Patches/0322-Improve-ProjectileHitEvent-to-include-the-BlockFace-.patch @@ -1,4 +1,4 @@ -From 88ea90f3fcea86a0d4c1e6ff7b82549943b5f9fb Mon Sep 17 00:00:00 2001 +From e66cac106ad45ebee9efc27046d70074f702add0 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sat, 30 Jun 2018 05:45:39 +0200 Subject: [PATCH] Improve ProjectileHitEvent to include the BlockFace where the @@ -19,5 +19,5 @@ index 9b19c055d..248873fb4 100644 return event; } -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0320-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0323-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 97% rename from Spigot-Server-Patches/0320-Add-config-to-disable-ender-dragon-legacy-check.patch rename to Spigot-Server-Patches/0323-Add-config-to-disable-ender-dragon-legacy-check.patch index 56aabc6465..318091227a 100644 --- a/Spigot-Server-Patches/0320-Add-config-to-disable-ender-dragon-legacy-check.patch +++ b/Spigot-Server-Patches/0323-Add-config-to-disable-ender-dragon-legacy-check.patch @@ -1,4 +1,4 @@ -From 0e503db872486829a878a7fd7a36eb7ef9207579 Mon Sep 17 00:00:00 2001 +From 0928ca54d1f1a8ff9ab5cf229712c4eb7cf08359 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 22 Jun 2018 10:38:31 -0500 Subject: [PATCH] Add config to disable ender dragon legacy check @@ -48,5 +48,5 @@ index ce0dcbc68..286069746 100644 if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) { if (nbttagcompound.b("DragonUUID")) { -- -2.17.1 +2.18.0 diff --git a/Spigot-Server-Patches/0321-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0324-Implement-World.getEntity-UUID-API.patch similarity index 91% rename from Spigot-Server-Patches/0321-Implement-World.getEntity-UUID-API.patch rename to Spigot-Server-Patches/0324-Implement-World.getEntity-UUID-API.patch index f3753a7077..1a2c3f13d1 100644 --- a/Spigot-Server-Patches/0321-Implement-World.getEntity-UUID-API.patch +++ b/Spigot-Server-Patches/0324-Implement-World.getEntity-UUID-API.patch @@ -1,4 +1,4 @@ -From 45b9aa46ba5547e98975dacc52a5caefffdc5721 Mon Sep 17 00:00:00 2001 +From 5ec6400e2dacd349692bfb12ae6dadce5fa2d394 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:08:14 +0200 Subject: [PATCH] Implement World.getEntity(UUID) API @@ -24,5 +24,5 @@ index e2da30d88..210e3bc4e 100644 // Spigot start save(true); -- -2.16.1.windows.1 +2.18.0 diff --git a/Spigot-Server-Patches/0322-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0325-InventoryCloseEvent-Reason-API.patch similarity index 98% rename from Spigot-Server-Patches/0322-InventoryCloseEvent-Reason-API.patch rename to Spigot-Server-Patches/0325-InventoryCloseEvent-Reason-API.patch index ef36008559..02e3fce3a0 100644 --- a/Spigot-Server-Patches/0322-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0325-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 579bde3a655017237446cb5e5589764243e25609 Mon Sep 17 00:00:00 2001 +From c01c4b4de68c5d265fbd209c218fd9c49d361108 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,10 +7,10 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 7cd537a59..ddd5ed57d 100644 +index 87d0d426f..71d0db3f3 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java -@@ -836,7 +836,7 @@ public class Chunk { +@@ -873,7 +873,7 @@ public class Chunk { { if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity ) { @@ -19,7 +19,7 @@ index 7cd537a59..ddd5ed57d 100644 } } } -@@ -861,7 +861,7 @@ public class Chunk { +@@ -898,7 +898,7 @@ public class Chunk { { if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity ) {