diff options
| author | Zach Brown <[email protected]> | 2017-03-24 22:18:58 -0500 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2017-03-24 22:27:43 -0500 |
| commit | 07d0098a9e56ef9267fcba4f1d90e009a2d5ab86 (patch) | |
| tree | 885dda874b931e627ee521bc2466cc5bba449732 | |
| parent | 1d87ea2179fca8f9505e1a2be7df6124992fe06d (diff) | |
| download | Paper-07d0098a9e56ef9267fcba4f1d90e009a2d5ab86.tar.gz Paper-07d0098a9e56ef9267fcba4f1d90e009a2d5ab86.zip | |
Update upstream B/CB/S
Adds /paper command for reloading the paper config.
Closes GH-639
Per-world config logging has been removed in favor of all or nothing
logging for all paper settings. I don't believe it was used enough to
warrant maintaining. If this is not the case it should be possible to
re-add it.
88 files changed, 582 insertions, 581 deletions
diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index 893d89001b..731a740cbf 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,15 +1,70 @@ -From 20b7319640b3687ea5e7b422e478eb1576ff10a7 Mon Sep 17 00:00:00 2001 +From 6c3465d75b4745ffa054704f456e983a86564e4a Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files +diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java +new file mode 100644 +index 000000000..13d5a8ef3 +--- /dev/null ++++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java +@@ -0,0 +1,49 @@ ++package com.destroystokyo.paper; ++ ++import net.minecraft.server.MinecraftServer; ++import net.minecraft.server.WorldServer; ++import org.bukkit.ChatColor; ++import org.bukkit.command.Command; ++import org.bukkit.command.CommandSender; ++ ++import java.io.File; ++ ++public class PaperCommand extends Command { ++ ++ public PaperCommand(String name) { ++ super(name); ++ this.description = "Paper related commands"; ++ this.usageMessage = "/paper [reload | version]"; ++ this.setPermission("bukkit.command.paper"); ++ } ++ ++ @Override ++ public boolean execute(CommandSender sender, String commandLabel, String[] args) { ++ if (!testPermission(sender)) return true; ++ ++ if (args.length != 1) { ++ sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage); ++ return false; ++ } ++ ++ if (args[0].equals("reload")) { ++ Command.broadcastCommandMessage(sender, ChatColor.RED + "Please note that this command is not supported and may cause issues."); ++ Command.broadcastCommandMessage(sender, ChatColor.RED + "If you encounter any issues please use the /stop command to restart your server."); ++ ++ MinecraftServer console = MinecraftServer.getServer(); ++ com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); ++ for (WorldServer world : console.worlds) { ++ world.paperConfig.init(); ++ } ++ console.server.reloadCount++; ++ ++ Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Paper config reload complete."); ++ } ++ ++ if (args[0].equals("version")) { ++ org.bukkit.Bukkit.getServer().getCommandMap().getCommand("version").execute(sender, commandLabel, new String[0]); ++ } ++ ++ return true; ++ } ++} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 -index 000000000..c009c5f12 +index 000000000..328ff012b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -0,0 +1,164 @@ +@@ -0,0 +1,173 @@ +package com.destroystokyo.paper; + +import com.google.common.base.Throwables; @@ -49,7 +104,8 @@ index 000000000..c009c5f12 + public static YamlConfiguration config; + static int version; + static Map<String, Command> commands; -+ /*========================================================================*/ ++ private static boolean verbose; ++ /*========================================================================*/ + + public static void init(File configFile) { + CONFIG_FILE = configFile; @@ -63,14 +119,22 @@ index 000000000..c009c5f12 + } + config.options().header(HEADER); + config.options().copyDefaults(true); ++ verbose = getBoolean("verbose", false); + + commands = new HashMap<String, Command>(); ++ commands.put("paper", new PaperCommand("paper")); + + version = getInt("config-version", 12); + set("config-version", 12); + readConfig(PaperConfig.class, null); + } + ++ protected static void log(String s) { ++ if (verbose) { ++ Bukkit.getLogger().info(s); ++ } ++ } ++ + public static void registerCommands() { + for (Map.Entry<String, Command> entry : commands.entrySet()) { + MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue()); @@ -176,10 +240,10 @@ index 000000000..c009c5f12 +} diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java new file mode 100644 -index 000000000..dae60dcce +index 000000000..621bf7051 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -0,0 +1,72 @@ +@@ -0,0 +1,66 @@ +package com.destroystokyo.paper; + +import java.util.List; @@ -188,6 +252,8 @@ index 000000000..dae60dcce +import org.bukkit.configuration.file.YamlConfiguration; +import org.spigotmc.SpigotWorldConfig; + ++import static com.destroystokyo.paper.PaperConfig.log; ++ +public class PaperWorldConfig { + + private final String worldName; @@ -203,18 +269,10 @@ index 000000000..dae60dcce + } + + public void init() { -+ this.verbose = getBoolean("verbose", false); -+ + log("-------- World Settings For [" + worldName + "] --------"); + PaperConfig.readConfig(PaperWorldConfig.class, this); + } + -+ private void log(String s) { -+ if (verbose) { -+ Bukkit.getLogger().info(s); -+ } -+ } -+ + private void set(String path, Object val) { + config.set("world-settings.default." + path, val); + if (config.get("world-settings." + worldName + "." + path) != null) { @@ -268,7 +326,7 @@ index 31756b80d..cb83e4f56 100644 DedicatedServer.LOGGER.info("Generating keypair"); this.a(MinecraftEncryption.b()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d7cc8b60f..b29375a0c 100644 +index eab11685c..758962e67 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -125,6 +125,8 @@ public abstract class World implements IBlockAccess { @@ -316,7 +374,7 @@ index 312260764..791383fb3 100644 overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index b931cd5c3..788bf6617 100644 +index ee8ec5a68..4399faf69 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -126,6 +126,14 @@ public class Main { @@ -335,7 +393,7 @@ index b931cd5c3..788bf6617 100644 }; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index fd859f1a6..be003ce65 100644 +index 01e73eb89..0b66f5e35 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -39,31 +39,31 @@ public class SpigotWorldConfig @@ -376,5 +434,5 @@ index fd859f1a6..be003ce65 100644 config.addDefault( "world-settings.default." + path, def ); return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) ); -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch index 558a4c70fe..6c3cee6f08 100644 --- a/Spigot-Server-Patches/0005-Timings-v2.patch +++ b/Spigot-Server-Patches/0005-Timings-v2.patch @@ -1,11 +1,11 @@ -From 3e37c01cae2afb8617608e37133bce66429d60d2 Mon Sep 17 00:00:00 2001 +From a8603339050a20775e8fe0d8b4ab72979ec40ca8 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 diff --git a/pom.xml b/pom.xml -index 8b96966d..8d1e8680 100644 +index 8b96966d8..8d1e8680b 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,12 @@ @@ -23,7 +23,7 @@ index 8b96966d..8d1e8680 100644 <version>3.0.3</version> diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java new file mode 100644 -index 00000000..4b4b77a5 +index 000000000..4b4b77a5c --- /dev/null +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -0,0 +1,124 @@ @@ -153,7 +153,7 @@ index 00000000..4b4b77a5 +} diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java new file mode 100644 -index 00000000..b79f1be7 +index 000000000..b79f1be7a --- /dev/null +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java @@ -0,0 +1,126 @@ @@ -285,7 +285,7 @@ index 00000000..b79f1be7 +} diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java new file mode 100644 -index 00000000..e7789117 +index 000000000..e7789117b --- /dev/null +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java @@ -0,0 +1,101 @@ @@ -391,7 +391,7 @@ index 00000000..e7789117 + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index c009c5f1..e6798908 100644 +index 328ff012b..0a6f9b256 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit; @@ -409,7 +409,7 @@ index c009c5f1..e6798908 100644 public class PaperConfig { -@@ -161,4 +164,24 @@ public class PaperConfig { +@@ -170,4 +173,24 @@ public class PaperConfig { config.addDefault(path, def); return config.getString(path, config.getString(path)); } @@ -428,14 +428,14 @@ index c009c5f1..e6798908 100644 + Timings.setHistoryInterval(timingHistoryInterval * 20); + Timings.setHistoryLength(timingHistoryLength * 20); + -+ Bukkit.getLogger().log(Level.INFO, "Spigot Timings: " + timings + ++ log("Timings: " + timings + + " - Verbose: " + verboseTimings + + " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) + + " - Length: " + timeSummary(Timings.getHistoryLength() / 20)); + } } diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index e8511ac9..d3f1a4ac 100644 +index e8511ac9a..d3f1a4ac0 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -35,6 +35,15 @@ public class Block { @@ -455,7 +455,7 @@ index e8511ac9..d3f1a4ac 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 81fc04ed..bd3b1602 100644 +index 81fc04ed3..bd3b16025 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 { @@ -503,7 +503,7 @@ index 81fc04ed..bd3b1602 100644 private void z() { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index daf2c0a6..3ba489d4 100644 +index daf2c0a67..3ba489d4f 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -195,7 +195,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -525,7 +525,7 @@ index daf2c0a6..3ba489d4 100644 this.chunkLoader.a(this.world, chunk); } catch (IOException ioexception) { diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index a97e7d3c..4890023d 100644 +index a97e7d3c2..4890023d7 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -402,7 +402,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -565,7 +565,7 @@ index a97e7d3c..4890023d 100644 // return chunk; // CraftBukkit } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index cb83e4f5..e6819139 100644 +index cb83e4f56..e6819139f 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -23,7 +23,7 @@ import java.io.PrintStream; @@ -618,7 +618,7 @@ index cb83e4f5..e6819139 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 27973925..8fd88431 100644 +index 9bd9dc28b..14d23556f 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; @@ -640,7 +640,7 @@ index 27973925..8fd88431 100644 // Spigot start public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this); public final boolean defaultActivationState; -@@ -475,7 +476,6 @@ public abstract class Entity implements ICommandListener { +@@ -523,7 +524,6 @@ public abstract class Entity implements ICommandListener { } public void move(EnumMoveType enummovetype, double d0, double d1, double d2) { @@ -648,7 +648,7 @@ index 27973925..8fd88431 100644 if (this.noclip) { this.a(this.getBoundingBox().d(d0, d1, d2)); this.recalcPosition(); -@@ -867,7 +867,6 @@ public abstract class Entity implements ICommandListener { +@@ -915,7 +915,6 @@ public abstract class Entity implements ICommandListener { this.world.methodProfiler.b(); } @@ -657,7 +657,7 @@ index 27973925..8fd88431 100644 public void recalcPosition() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e9002c95..b22f81b1 100644 +index e9002c953..b22f81b12 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -728,7 +728,7 @@ index e9002c95..b22f81b1 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java -index 347a2b67..aceb08ce 100644 +index 347a2b671..aceb08ce1 100644 --- a/src/main/java/net/minecraft/server/EntityTracker.java +++ b/src/main/java/net/minecraft/server/EntityTracker.java @@ -175,7 +175,7 @@ public class EntityTracker { @@ -759,7 +759,7 @@ index 347a2b67..aceb08ce 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d1b488e8..8f7b148a 100644 +index d1b488e8f..8f7b148a1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -47,8 +47,8 @@ import org.bukkit.Bukkit; @@ -900,7 +900,7 @@ index d1b488e8..8f7b148a 100644 this.methodProfiler.b(); } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 703d5813..021dfba1 100644 +index 703d5813d..021dfba14 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1,5 +1,6 @@ @@ -1000,7 +1000,7 @@ index 703d5813..021dfba1 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f2c2bab8..db651f67 100644 +index 86f9776ee..e19513a96 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; @@ -1011,7 +1011,7 @@ index f2c2bab8..db651f67 100644 // CraftBukkit end public class PlayerConnection implements PacketListenerPlayIn, ITickable { -@@ -1326,7 +1327,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1334,7 +1335,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // CraftBukkit end private void handleCommand(String s) { @@ -1020,7 +1020,7 @@ index f2c2bab8..db651f67 100644 // CraftBukkit start - whole method if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot this.LOGGER.info(this.player.getName() + " issued server command: " + s); -@@ -1337,22 +1338,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1345,22 +1346,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { this.server.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -1048,7 +1048,7 @@ index f2c2bab8..db651f67 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java -index f74b0679..1fc632e0 100644 +index f74b06794..1fc632e0c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -1,15 +1,21 @@ @@ -1078,7 +1078,7 @@ index f74b0679..1fc632e0 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index c0af82b4..676cc3f3 100644 +index c0af82b48..676cc3f3e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -1102,7 +1102,7 @@ index c0af82b4..676cc3f3 100644 public void addWhitelist(GameProfile gameprofile) { diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index f1f20650..fb350c40 100644 +index f1f206501..fb350c408 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -1,5 +1,7 @@ @@ -1144,7 +1144,7 @@ index f1f20650..fb350c40 100644 return flag; } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 6958a2e0..b3d3df4c 100644 +index 6958a2e0f..b3d3df4cf 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; @@ -1164,7 +1164,7 @@ index 6958a2e0..b3d3df4c 100644 private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials(); protected World world; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 65f5d63e..216a627d 100644 +index 758962e67..a87b37277 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,11 +18,11 @@ import com.google.common.collect.Maps; @@ -1260,7 +1260,7 @@ index 65f5d63e..216a627d 100644 if (entity.isPassenger()) { entity.aw(); } else { -@@ -1686,8 +1691,6 @@ public abstract class World implements IBlockAccess { +@@ -1687,8 +1692,6 @@ public abstract class World implements IBlockAccess { } } } @@ -1270,7 +1270,7 @@ index 65f5d63e..216a627d 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 391a09c5..96693899 100644 +index 391a09c52..966938997 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -247,13 +247,13 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -1403,7 +1403,7 @@ index 391a09c5..96693899 100644 // CraftBukkit start diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 791383fb..38ce0582 100644 +index 791383fb3..38ce05828 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1737,6 +1737,7 @@ public final class CraftServer implements Server { @@ -1441,7 +1441,7 @@ index 791383fb..38ce0582 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java deleted file mode 100644 -index 41d2d87e..00000000 +index 41d2d87ee..000000000 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java +++ /dev/null @@ -1,173 +0,0 @@ @@ -1619,7 +1619,7 @@ index 41d2d87e..00000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java -index 3a95b446..b5efb9c3 100644 +index 3a95b4465..b5efb9c3f 100644 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java @@ -1,6 +1,8 @@ @@ -1663,7 +1663,7 @@ index 3a95b446..b5efb9c3 100644 public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ed2ccdd5..08f3b080 100644 +index a2811832e..9f452043f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -39,15 +39,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; @@ -1683,7 +1683,7 @@ index ed2ccdd5..08f3b080 100644 import org.bukkit.craftbukkit.map.CraftMapView; import org.bukkit.craftbukkit.map.RenderData; import org.bukkit.craftbukkit.scoreboard.CraftScoreboard; -@@ -1605,6 +1599,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1606,6 +1600,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { packet.components = components; getHandle().playerConnection.sendPacket(packet); } @@ -1697,7 +1697,7 @@ index ed2ccdd5..08f3b080 100644 public Player.Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 92d217bc..9952b64b 100644 +index 92d217bce..9952b64be 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; @@ -1773,7 +1773,7 @@ index 92d217bc..9952b64b 100644 private boolean isReady(final int currentTick) { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java -index 220e39ab..afc6c17e 100644 +index 220e39abe..afc6c17e6 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java @@ -1,8 +1,8 @@ @@ -1855,7 +1855,7 @@ index 220e39ab..afc6c17e 100644 - // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java -index e52ef47b..3d90b342 100644 +index e52ef47b7..3d90b3426 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon; @@ -1867,7 +1867,7 @@ index e52ef47b..3d90b342 100644 this.value = value; } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index c32d44df..5c2fb005 100644 +index c32d44df0..5c2fb0058 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither; diff --git a/Spigot-Server-Patches/0006-Configurable-squid-spawn-ranges.patch b/Spigot-Server-Patches/0006-Configurable-squid-spawn-ranges.patch index ba03036198..ea0bbedf22 100644 --- a/Spigot-Server-Patches/0006-Configurable-squid-spawn-ranges.patch +++ b/Spigot-Server-Patches/0006-Configurable-squid-spawn-ranges.patch @@ -1,14 +1,14 @@ -From ba20e837e38f468c105978d3289fe3c5b31fdea8 Mon Sep 17 00:00:00 2001 +From de528a5f3327325979e9c922f947a68d8f6a05f3 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 1 Mar 2016 12:45:11 -0600 Subject: [PATCH] Configurable squid spawn ranges diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index dae60dc..c74c8a7 100644 +index 621bf7051..f24839378 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -69,4 +69,12 @@ public class PaperWorldConfig { +@@ -63,4 +63,12 @@ public class PaperWorldConfig { config.addDefault("world-settings.default." + path, def); return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path)); } @@ -22,7 +22,7 @@ index dae60dc..c74c8a7 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 9f88e44..56f7ca8 100644 +index 549e3434b..bc0652874 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -141,7 +141,7 @@ public class EntitySquid extends EntityWaterAnimal { @@ -35,5 +35,5 @@ index 9f88e44..56f7ca8 100644 public void b(float f, float f1, float f2) { -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch index f6550b4df5..77fbe21253 100644 --- a/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch +++ b/Spigot-Server-Patches/0007-Configurable-cactus-and-reed-natural-growth-heights.patch @@ -1,14 +1,14 @@ -From fb33837750d4fdd9577d1baea535a594d1b3e899 Mon Sep 17 00:00:00 2001 +From 9d3232a2cbd15f79ee0f7e152ef02dc867d1840f Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 1 Mar 2016 13:02:51 -0600 Subject: [PATCH] Configurable cactus and reed natural growth heights diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c74c8a7..8d9c322 100644 +index f24839378..6228bc1f6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -77,4 +77,13 @@ public class PaperWorldConfig { +@@ -71,4 +71,13 @@ public class PaperWorldConfig { squidMaxSpawnHeight = getDouble("squid-spawn-height.maximum", 63.0D); log("Squids will spawn between Y: " + squidMinSpawnHeight + " and Y: " + squidMaxSpawnHeight); } @@ -23,7 +23,7 @@ index c74c8a7..8d9c322 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java -index 3f579fb..a69a707 100644 +index 3f579fbdb..a69a707aa 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -28,7 +28,7 @@ public class BlockCactus extends Block { @@ -36,7 +36,7 @@ index 3f579fb..a69a707 100644 if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java -index 84014b1..9d1af2a 100644 +index 84014b1c7..9d1af2adc 100644 --- a/src/main/java/net/minecraft/server/BlockReed.java +++ b/src/main/java/net/minecraft/server/BlockReed.java @@ -28,7 +28,7 @@ public class BlockReed extends Block { @@ -49,5 +49,5 @@ index 84014b1..9d1af2a 100644 if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch index ce743eafb9..965f8efe50 100644 --- a/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch +++ b/Spigot-Server-Patches/0008-Configurable-baby-zombie-movement-speed.patch @@ -1,14 +1,14 @@ -From 9f388589db8284372e23b471d7139f5321c51970 Mon Sep 17 00:00:00 2001 +From 790816c05478aaff9ca2e42497b728d335eac504 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 1 Mar 2016 13:09:16 -0600 Subject: [PATCH] Configurable baby zombie movement speed diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 8d9c322..ae3d0e4 100644 +index 6228bc1f6..fe9e7b342 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -86,4 +86,10 @@ public class PaperWorldConfig { +@@ -80,4 +80,10 @@ public class PaperWorldConfig { log("Max height for cactus growth " + cactusMaxHeight + ". Max height for reed growth " + reedMaxHeight); } @@ -20,7 +20,7 @@ index 8d9c322..ae3d0e4 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 497d559..897882c 100644 +index 497d5593c..897882c97 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -16,7 +16,7 @@ public class EntityZombie extends EntityMonster { @@ -45,5 +45,5 @@ index 497d559..897882c 100644 } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch index d4396e4f7f..7e4333f74c 100644 --- a/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0009-Configurable-fishing-time-ranges.patch @@ -1,14 +1,14 @@ -From d2e9e489fbf88f2b4b32be8b0c9125d5590409aa Mon Sep 17 00:00:00 2001 +From 54a3c63aa8ce0d58f434036ef58d29e25d0ea9b8 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 1 Mar 2016 13:14:11 -0600 Subject: [PATCH] Configurable fishing time ranges diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ae3d0e4..7b2b95d 100644 +index fe9e7b342..22999f0d2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -92,4 +92,12 @@ public class PaperWorldConfig { +@@ -86,4 +86,12 @@ public class PaperWorldConfig { babyZombieMovementSpeed = getDouble("baby-zombie-movement-speed", 0.5D); // Player moves at 0.1F, for reference log("Baby zombies will move at the speed of " + babyZombieMovementSpeed); } @@ -22,7 +22,7 @@ index ae3d0e4..7b2b95d 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 472f367..0c528c6 100644 +index 472f36774..0c528c699 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -381,7 +381,7 @@ public class EntityFishingHook extends Entity { @@ -35,5 +35,5 @@ index 472f367..0c528c6 100644 } } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch b/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch index 7346f10afb..b0a099aedb 100644 --- a/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch +++ b/Spigot-Server-Patches/0010-Allow-nerfed-mobs-to-jump.patch @@ -1,14 +1,14 @@ -From 06d29ae2bf47d827389f95b1654faf11c89f2bea Mon Sep 17 00:00:00 2001 +From 7fc4d230818cf9b8303ce829b2c45bc5bf8621c1 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 1 Mar 2016 13:24:16 -0600 Subject: [PATCH] Allow nerfed mobs to jump diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7b2b95dfa..021c01b2b 100644 +index 22999f0d2..5f13fbff3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -100,4 +100,9 @@ public class PaperWorldConfig { +@@ -94,4 +94,9 @@ public class PaperWorldConfig { fishingMaxTicks = getInt("fishing-time-range.MaximumTicks", 600); log("Fishing time ranges are between " + fishingMinTicks +" and " + fishingMaxTicks + " ticks"); } @@ -78,5 +78,5 @@ index e3b405856..2d27aa63a 100644 if (this.a.getRandom().nextFloat() < 0.8F) { this.a.getControllerJump().a(); -- -2.11.0.windows.1 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch index 28d43f0554..d8ddc238ec 100644 --- a/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0011-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,14 +1,14 @@ -From 03cedbb54a622527c73c7f42b215dd03a20ba637 Mon Sep 17 00:00:00 2001 +From 8454fb258664baf7b6c6d257c4d36b328aa9c60f Mon Sep 17 00:00:00 2001 From: Suddenly <[email protected]> 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 021c01b2b..92f38a450 100644 +index 5f13fbff3..4b64ccaa0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -105,4 +105,20 @@ public class PaperWorldConfig { +@@ -99,4 +99,20 @@ public class PaperWorldConfig { private void nerfedMobsShouldJump() { nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false); } @@ -51,5 +51,5 @@ index 59654bcc9..21f5df3c0 100644 } } -- -2.11.0.windows.1 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch index ed828bd445..b0e8f80b7e 100644 --- a/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0012-Allow-for-toggling-of-spawn-chunks.patch @@ -1,14 +1,14 @@ -From 25c9e1be46572bac02d6ab4726a60d5e9948d3bc Mon Sep 17 00:00:00 2001 +From 97865c7e6e3ab14d911ee022f7538fba90a5f601 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> 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 92f38a4..c2c488a 100644 +index 4b64ccaa0..7ac6a5f1f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -121,4 +121,10 @@ public class PaperWorldConfig { +@@ -115,4 +115,10 @@ public class PaperWorldConfig { softDespawnDistance = softDespawnDistance*softDespawnDistance; hardDespawnDistance = hardDespawnDistance*hardDespawnDistance; } @@ -20,7 +20,7 @@ index 92f38a4..c2c488a 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 78b5a3c..69aeaca 100644 +index a87b37277..edd6c3b5e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -198,6 +198,7 @@ public abstract class World implements IBlockAccess { @@ -32,5 +32,5 @@ index 78b5a3c..69aeaca 100644 this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch index 7cf0626080..dc8e861da9 100644 --- a/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch +++ b/Spigot-Server-Patches/0013-Drop-falling-block-and-tnt-entities-at-the-specified.patch @@ -1,14 +1,14 @@ -From 3de36042c25fa09c19415aa1690d56c108edd328 Mon Sep 17 00:00:00 2001 +From 0eada54aa2eee86bf693c1ac9f60195a38eb41ff Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Tue, 1 Mar 2016 14:14:15 -0600 Subject: [PATCH] Drop falling block and tnt entities at the specified height diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c2c488a..d44fdae 100644 +index 7ac6a5f1f..8cdeb34d4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -127,4 +127,14 @@ public class PaperWorldConfig { +@@ -121,4 +121,14 @@ public class PaperWorldConfig { keepSpawnInMemory = getBoolean("keep-spawn-loaded", true); log("Keep spawn chunk loaded: " + keepSpawnInMemory); } @@ -24,7 +24,7 @@ index c2c488a..d44fdae 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index bce4c3c..2ed1fb1 100644 +index 5c5038402..4c168d333 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -80,6 +80,16 @@ public class EntityFallingBlock extends Entity { @@ -45,7 +45,7 @@ index bce4c3c..2ed1fb1 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 0fbdbd6..fd07356 100644 +index 0fbdbd69b..fd0735611 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -56,6 +56,13 @@ public class EntityTNTPrimed extends Entity { @@ -63,5 +63,5 @@ index 0fbdbd6..fd07356 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch index f1ddce24d2..e59ed58dbe 100644 --- a/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0014-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,14 +1,14 @@ -From 27e763ca619d7797d124edb43955e8c424c23ba7 Mon Sep 17 00:00:00 2001 +From 54abcccc1027dc80e9fd95a4fe70f473213b19b2 Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Tue, 1 Mar 2016 14:27:13 -0600 Subject: [PATCH] Configurable speed for water flowing over lava diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d44fdae..06d1527 100644 +index 8cdeb34d4..62e6830aa 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -137,4 +137,10 @@ public class PaperWorldConfig { +@@ -131,4 +131,10 @@ public class PaperWorldConfig { if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf); if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf); } @@ -20,7 +20,7 @@ index d44fdae..06d1527 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index c9294a5..f4ac7ba 100644 +index c9294a58d..f4ac7bafa 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -30,7 +30,7 @@ public class BlockFlowing extends BlockFluids { @@ -57,5 +57,5 @@ index c9294a5..f4ac7ba 100644 + } } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch index 27dc440958..af8614c619 100644 --- a/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0016-Player-affects-spawning-API.patch @@ -1,11 +1,11 @@ -From 712d5956c8de0c6e33b8bb09bf92c90b19cd7627 Mon Sep 17 00:00:00 2001 +From 90a7f499e10cfa5104a1a22197a931454fef07c8 Mon Sep 17 00:00:00 2001 From: Jedediah Smith <[email protected]> Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index ec8f581a..43e28d61 100644 +index ec8f581ad..43e28d61c 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -63,6 +63,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -17,7 +17,7 @@ index ec8f581a..43e28d61 100644 // CraftBukkit start public boolean fauxSleeping; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 21f5df3c..a7283d36 100644 +index 21f5df3c0..a7283d36d 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -616,7 +616,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -30,7 +30,7 @@ index 21f5df3c..a7283d36 100644 double d1 = entityhuman.locY - this.locY; double d2 = entityhuman.locZ - this.locZ; diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java -index 5af51cc0..7531c9ba 100644 +index 5af51cc0a..7531c9ba9 100644 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java @@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster { @@ -44,7 +44,7 @@ index 5af51cc0..7531c9ba 100644 return false; } diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 17bf3e41..a05fad54 100644 +index 17bf3e410..a05fad54f 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -52,7 +52,7 @@ public final class SpawnerCreature { @@ -57,10 +57,10 @@ index 17bf3e41..a05fad54 100644 j = MathHelper.floor(entityhuman.locZ / 16.0D); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 40685515..70d62e8d 100644 +index edd6c3b5e..751fc01d1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -2721,7 +2721,7 @@ public abstract class World implements IBlockAccess { +@@ -2722,7 +2722,7 @@ public abstract class World implements IBlockAccess { for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman = (EntityHuman) this.players.get(i); @@ -70,10 +70,10 @@ index 40685515..70d62e8d 100644 if (d3 < 0.0D || d4 < d3 * d3) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 08f3b080..b6cfd0dc 100644 +index 9f452043f..b412bf653 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1468,6 +1468,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1469,6 +1469,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } diff --git a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch index bcbcd272a7..d6660ea3e8 100644 --- a/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0021-Only-refresh-abilities-if-needed.patch @@ -1,14 +1,14 @@ -From fbe89b0b1b40c6d612c1fc3269642590a04ef205 Mon Sep 17 00:00:00 2001 +From 626b095ddadaefce16e25168f532b8152fe234e6 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 1 Mar 2016 23:12:03 -0600 Subject: [PATCH] Only refresh abilities if needed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b6cfd0d..7212238 100644 +index b412bf653..65aca0091 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1184,12 +1184,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1185,12 +1185,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setFlying(boolean value) { @@ -24,5 +24,5 @@ index b6cfd0d..7212238 100644 @Override -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0023-Entity-Origin-API.patch b/Spigot-Server-Patches/0023-Entity-Origin-API.patch index 51ab67ec02..44dcfe8f86 100644 --- a/Spigot-Server-Patches/0023-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0023-Entity-Origin-API.patch @@ -1,11 +1,11 @@ -From b5f277e2bad37806c03c3365f09a0741c73f107e Mon Sep 17 00:00:00 2001 +From a4ea505f84809c0f4168a71e10a6714484a4cc75 Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> 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 8fd884314..1e2e042b7 100644 +index 14d23556f..313100aed 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -147,6 +147,7 @@ public abstract class Entity implements ICommandListener { @@ -16,7 +16,7 @@ index 8fd884314..1e2e042b7 100644 // Spigot start public final byte activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this); public final boolean defaultActivationState; -@@ -1465,6 +1466,11 @@ public abstract class Entity implements ICommandListener { +@@ -1513,6 +1514,11 @@ public abstract class Entity implements ICommandListener { } } @@ -28,7 +28,7 @@ index 8fd884314..1e2e042b7 100644 return nbttagcompound; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT"); -@@ -1609,6 +1615,13 @@ public abstract class Entity implements ICommandListener { +@@ -1657,6 +1663,13 @@ public abstract class Entity implements ICommandListener { } // CraftBukkit end @@ -42,7 +42,7 @@ index 8fd884314..1e2e042b7 100644 } catch (Throwable throwable) { CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT"); CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded"); -@@ -1633,6 +1646,7 @@ public abstract class Entity implements ICommandListener { +@@ -1681,6 +1694,7 @@ public abstract class Entity implements ICommandListener { protected abstract void b(NBTTagCompound nbttagcompound); @@ -89,7 +89,7 @@ index fd0735611..25e471d37 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 70d62e8d0..e39b966c5 100644 +index 751fc01d1..39919ab1c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1021,6 +1021,12 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch index 60d8608dd5..e805314b95 100644 --- a/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0025-Configurable-top-of-nether-void-damage.patch @@ -1,14 +1,14 @@ -From e908056a4daf3e4518969e549bf3a48147229fa3 Mon Sep 17 00:00:00 2001 +From f39ff351a0d3263158ec312e3cb0a3e0e54283ff Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> 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 06d15276..2767ffb7 100644 +index 62e6830aa..e524a464f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -143,4 +143,10 @@ public class PaperWorldConfig { +@@ -137,4 +137,10 @@ public class PaperWorldConfig { waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5); log("Water over lava flow speed: " + waterOverLavaFlowSpeed); } @@ -20,10 +20,10 @@ index 06d15276..2767ffb7 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1e2e042b..e851e78a 100644 +index 313100aed..7feed2995 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -394,9 +394,15 @@ public abstract class Entity implements ICommandListener { +@@ -442,9 +442,15 @@ public abstract class Entity implements ICommandListener { this.fallDistance *= 0.5F; } @@ -39,7 +39,7 @@ index 1e2e042b..e851e78a 100644 if (!this.world.isClientSide) { this.setFlag(0, this.fireTicks > 0); -@@ -406,6 +412,18 @@ public abstract class Entity implements ICommandListener { +@@ -454,6 +460,18 @@ public abstract class Entity implements ICommandListener { this.world.methodProfiler.b(); } @@ -58,7 +58,7 @@ index 1e2e042b..e851e78a 100644 protected void H() { if (this.portalCooldown > 0) { --this.portalCooldown; -@@ -462,6 +480,7 @@ public abstract class Entity implements ICommandListener { +@@ -510,6 +528,7 @@ public abstract class Entity implements ICommandListener { this.fireTicks = 0; } @@ -67,7 +67,7 @@ index 1e2e042b..e851e78a 100644 this.die(); } diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index fd3337d3..ca1faa41 100644 +index fd3337d3f..ca1faa41d 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 diff --git a/Spigot-Server-Patches/0028-Lighting-Queue.patch b/Spigot-Server-Patches/0028-Lighting-Queue.patch index 5e456c0b97..65e0dbdf9c 100644 --- a/Spigot-Server-Patches/0028-Lighting-Queue.patch +++ b/Spigot-Server-Patches/0028-Lighting-Queue.patch @@ -1,4 +1,4 @@ -From befa5d1bd6dfb9a08d165e275cd9bd51200940d2 Mon Sep 17 00:00:00 2001 +From 72852de2a09e0ead6ff570f9c063bcf6b3d24854 Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Wed, 2 Mar 2016 00:52:31 -0600 Subject: [PATCH] Lighting Queue @@ -27,10 +27,10 @@ index e7789117b..f90f5bf84 100644 } } diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 2767ffb78..f7a0c18a8 100644 +index e524a464f..fd606ee14 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -149,4 +149,10 @@ public class PaperWorldConfig { +@@ -143,4 +143,10 @@ public class PaperWorldConfig { netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false ); log("Top of the nether void damage: " + netherVoidTopDamage); } @@ -97,7 +97,7 @@ index 3ba489d4f..f7f2d12cf 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 91fb12128..1d9ba0d0f 100644 +index 4476799d8..f953ef8e0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -721,7 +721,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -225,7 +225,7 @@ index 000000000..d8d3e1efd + } +} diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 4a35d06e4..b38228707 100644 +index 632d5c760..e6e85e7a8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -387,7 +387,7 @@ public abstract class World implements IBlockAccess { @@ -238,5 +238,5 @@ index 4a35d06e4..b38228707 100644 } -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0029-Configurable-end-credits.patch b/Spigot-Server-Patches/0029-Configurable-end-credits.patch index b3a09555d7..3b0b9e5830 100644 --- a/Spigot-Server-Patches/0029-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0029-Configurable-end-credits.patch @@ -1,14 +1,14 @@ -From 3b508958a6df58a75ec54bc7bbea5e5cf1cd89bf Mon Sep 17 00:00:00 2001 +From 2d9ec51993b37973d282f321458d6faaf07bd49e Mon Sep 17 00:00:00 2001 From: DoctorDark <[email protected]> Date: Wed, 16 Mar 2016 02:21:39 -0500 Subject: [PATCH] Configurable end credits diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f7a0c18..31503e7 100644 +index fd606ee14..c00fa83d5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -155,4 +155,10 @@ public class PaperWorldConfig { +@@ -149,4 +149,10 @@ public class PaperWorldConfig { queueLightUpdates = getBoolean("queue-light-updates", false); log("Lighting Queue enabled: " + queueLightUpdates); } @@ -20,7 +20,7 @@ index f7a0c18..31503e7 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 64ba161..a11d882 100644 +index b311903fb..378057e85 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -513,6 +513,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -52,5 +52,5 @@ index 64ba161..a11d882 100644 } else { this.b((Statistic) AchievementList.D); -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0031-Generator-Settings.patch b/Spigot-Server-Patches/0031-Generator-Settings.patch index e6c1185609..274ed29554 100644 --- a/Spigot-Server-Patches/0031-Generator-Settings.patch +++ b/Spigot-Server-Patches/0031-Generator-Settings.patch @@ -1,14 +1,14 @@ -From 8013611ea29f78ed2c393408a88e2cf1486b9658 Mon Sep 17 00:00:00 2001 +From 273bc543e9cd4c645049ec8e33d9eae4025ec4a5 Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Wed, 2 Mar 2016 02:17:54 -0600 Subject: [PATCH] Generator Settings diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 31503e7..bc50289 100644 +index c00fa83d5..3b19b53a8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -161,4 +161,28 @@ public class PaperWorldConfig { +@@ -155,4 +155,28 @@ public class PaperWorldConfig { disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false); log("End credits disabled: " + disableEndCredits); } @@ -38,7 +38,7 @@ index 31503e7..bc50289 100644 + } } diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index 62a338e..d3f1dce 100644 +index 62a338e95..d3f1dceb6 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -179,7 +179,7 @@ public abstract class BiomeBase { @@ -51,7 +51,7 @@ index 62a338e..d3f1dce 100644 } else { IBlockData iblockdata2 = chunksnapshot.a(k1, l1, j1); diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java -index 3d0a60b..1214193 100644 +index 3d0a60b93..121419302 100644 --- a/src/main/java/net/minecraft/server/BiomeMesa.java +++ b/src/main/java/net/minecraft/server/BiomeMesa.java @@ -99,7 +99,7 @@ public class BiomeMesa extends BiomeBase { @@ -64,7 +64,7 @@ index 3d0a60b..1214193 100644 } else if (l1 < 15 || this.J) { IBlockData iblockdata2 = chunksnapshot.a(l, i2, k); diff --git a/src/main/java/net/minecraft/server/ChunkProviderFlat.java b/src/main/java/net/minecraft/server/ChunkProviderFlat.java -index d958a66..f8a9f49 100644 +index d958a6654..f8a9f499f 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderFlat.java +++ b/src/main/java/net/minecraft/server/ChunkProviderFlat.java @@ -26,7 +26,7 @@ public class ChunkProviderFlat implements ChunkGenerator { @@ -110,7 +110,7 @@ index d958a66..f8a9f49 100644 int k = 0; boolean flag1 = true; diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java -index a8fc857..0530501 100644 +index 7ba6b9add..776ebd653 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java +++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java @@ -160,32 +160,32 @@ public class ChunkProviderGenerate implements ChunkGenerator { @@ -221,7 +221,7 @@ index a8fc857..0530501 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkProviderHell.java b/src/main/java/net/minecraft/server/ChunkProviderHell.java -index f9519d7..ca64ae0 100644 +index f9519d7e1..ca64ae067 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderHell.java +++ b/src/main/java/net/minecraft/server/ChunkProviderHell.java @@ -151,7 +151,10 @@ public class ChunkProviderHell implements ChunkGenerator { @@ -245,7 +245,7 @@ index f9519d7..ca64ae0 100644 } } diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index fb350c4..9c1605b 100644 +index fb350c408..9c1605b14 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -96,6 +96,7 @@ public abstract class StructureGenerator extends WorldGenBase { @@ -265,5 +265,5 @@ index fb350c4..9c1605b 100644 ObjectIterator objectiterator = this.c.values().iterator(); -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch index 8873e4894d..c1b657c8ae 100644 --- a/Spigot-Server-Patches/0032-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch @@ -1,4 +1,4 @@ -From 0a9dcecb7411da79274afd6894d356d7b23800ec Mon Sep 17 00:00:00 2001 +From 04028ca0d3b4b0eb358a3118acc84b30a49248bc Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Wed, 2 Mar 2016 11:59:48 -0600 Subject: [PATCH] Optimize explosions @@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving an entity's exposure during an explosion. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bc5028965..356265e91 100644 +index 3b19b53a8..a7dfd2af7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -185,4 +185,10 @@ public class PaperWorldConfig { +@@ -179,4 +179,10 @@ public class PaperWorldConfig { generateVillage = getBoolean("generator-settings.village", true); generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", false); } @@ -124,7 +124,7 @@ index 4e05bcdfa..49fc95e35 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1d9ba0d0f..b3454eae6 100644 +index f953ef8e0..3b67ff52e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -886,6 +886,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -136,7 +136,7 @@ index 1d9ba0d0f..b3454eae6 100644 // this.i[i][this.ticks % 100] = System.nanoTime() - j; // CraftBukkit diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b38228707..ea6f02a68 100644 +index e6e85e7a8..5f7590e11 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -15,6 +15,7 @@ import javax.annotation.Nullable; @@ -156,5 +156,5 @@ index b38228707..ea6f02a68 100644 public CraftWorld getWorld() { return this.world; -- -2.11.0.windows.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0034-Fast-draining.patch b/Spigot-Server-Patches/0034-Fast-draining.patch index 09b73db777..9bb0e71f86 100644 --- a/Spigot-Server-Patches/0034-Fast-draining.patch +++ b/Spigot-Server-Patches/0034-Fast-draining.patch @@ -1,14 +1,14 @@ -From 744980948a797748c01bbcaba313f3df560719bc Mon Sep 17 00:00:00 2001 +From ec1e69e287a2211ad9f14bd15e3c2cf371fa6082 Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Wed, 2 Mar 2016 12:20:52 -0600 Subject: [PATCH] Fast draining diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 356265e..2ec5068 100644 +index a7dfd2af7..e093f7dc1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -191,4 +191,11 @@ public class PaperWorldConfig { +@@ -185,4 +185,11 @@ public class PaperWorldConfig { optimizeExplosions = getBoolean("optimize-explosions", false); log("Optimize explosions: " + optimizeExplosions); } @@ -21,7 +21,7 @@ index 356265e..2ec5068 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index 801b9cb..8e9de3b 100644 +index 801b9cb7b..8e9de3bcb 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -69,7 +69,7 @@ public class BlockFlowing extends BlockFluids { @@ -109,5 +109,5 @@ index 801b9cb..8e9de3b 100644 + // Paper end } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch index a6a1654150..7a286e0a2b 100644 --- a/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch +++ b/Spigot-Server-Patches/0035-Configurable-lava-flow-speed.patch @@ -1,14 +1,14 @@ -From 43136d69e680c2f35f3b55b07f6ff59de2b57f6b Mon Sep 17 00:00:00 2001 +From c9cd7554a7447afb16a65d55ebf96a2c6ee3fd9f Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Wed, 2 Mar 2016 12:27:07 -0600 Subject: [PATCH] Configurable lava flow speed diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 2ec5068..b5a106d 100644 +index e093f7dc1..a197af84f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -198,4 +198,11 @@ public class PaperWorldConfig { +@@ -192,4 +192,11 @@ public class PaperWorldConfig { fastDrainLava = getBoolean("fast-drain.lava", false); fastDrainWater = getBoolean("fast-drain.water", false); } @@ -21,7 +21,7 @@ index 2ec5068..b5a106d 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index 8e9de3b..0a28236 100644 +index 8e9de3bcb..0a2823686 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -272,6 +272,9 @@ public class BlockFlowing extends BlockFluids { @@ -35,7 +35,7 @@ index 8e9de3b..0a28236 100644 world.getType(blockposition.north(1)).getBlock().material == Material.LAVA || world.getType(blockposition.south(1)).getBlock().material == Material.LAVA || diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java -index 660f3bc..a27512c 100644 +index 660f3bcce..a27512c0f 100644 --- a/src/main/java/net/minecraft/server/WorldProvider.java +++ b/src/main/java/net/minecraft/server/WorldProvider.java @@ -114,6 +114,7 @@ public abstract class WorldProvider { @@ -47,5 +47,5 @@ index 660f3bc..a27512c 100644 return this.e; } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch index 96847f8f8a..97c0b722a5 100644 --- a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch +++ b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch @@ -1,11 +1,11 @@ -From e4e006c25737184e22f276fed4881156b3d373d4 Mon Sep 17 00:00:00 2001 +From 34d326401bb597b21f6712b873d8b0e92d8475b5 Mon Sep 17 00:00:00 2001 From: Byteflux <[email protected]> Date: Wed, 2 Mar 2016 14:35:27 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 6a26569..1b8be82 100644 +index 378057e85..485e1c3c7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -57,6 +57,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -25,7 +25,7 @@ index 6a26569..1b8be82 100644 // CraftBukkit start public String displayName; diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 021dfba..9012a63 100644 +index 021dfba14..9012a63a0 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -47,7 +47,7 @@ public class PlayerChunkMap { @@ -194,10 +194,10 @@ index 021dfba..9012a63 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7212238..0bf3429 100644 +index 65aca0091..cc26aa748 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1479,6 +1479,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1480,6 +1480,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().affectsSpawning; } @@ -215,5 +215,5 @@ index 7212238..0bf3429 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch b/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch index 31e51500b2..5c0a3427af 100644 --- a/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch +++ b/Spigot-Server-Patches/0037-Disable-explosion-knockback.patch @@ -1,14 +1,14 @@ -From 100a23ef34a94e51c53f5c30f6f516bcc22b8194 Mon Sep 17 00:00:00 2001 +From b2beab2af3a84a6cd80b833cec20d43c3d699899 Mon Sep 17 00:00:00 2001 From: Sudzzy <[email protected]> Date: Wed, 2 Mar 2016 14:48:03 -0600 Subject: [PATCH] Disable explosion knockback diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b5a106d5b..fcbf8a25c 100644 +index a197af84f..2217f680c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -205,4 +205,9 @@ public class PaperWorldConfig { +@@ -199,4 +199,9 @@ public class PaperWorldConfig { lavaFlowSpeedNormal = getInt("lava-flow-speed.normal", 30); lavaFlowSpeedNether = getInt("lava-flow-speed.nether", 10); } @@ -19,7 +19,7 @@ index b5a106d5b..fcbf8a25c 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 4fbe92a5a..b959fdac8 100644 +index b22f81b12..e5fa1c3ba 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -893,12 +893,14 @@ public abstract class EntityLiving extends Entity { @@ -69,5 +69,5 @@ index 49fc95e35..d7bc6a0ed 100644 } } -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0038-Disable-thunder.patch b/Spigot-Server-Patches/0038-Disable-thunder.patch index fc4a0779ad..0e3ad6c102 100644 --- a/Spigot-Server-Patches/0038-Disable-thunder.patch +++ b/Spigot-Server-Patches/0038-Disable-thunder.patch @@ -1,14 +1,14 @@ -From 50c55198f8c72c73029453ba0bcb0e1cd828fe73 Mon Sep 17 00:00:00 2001 +From 4855da31c259635c9148c6eb7db94e696e810504 Mon Sep 17 00:00:00 2001 From: Sudzzy <[email protected]> Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index fcbf8a2..b52e5c5 100644 +index 2217f680c..a40d4887c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -210,4 +210,9 @@ public class PaperWorldConfig { +@@ -204,4 +204,9 @@ public class PaperWorldConfig { private void disableExplosionKnockback(){ disableExplosionKnockback = getBoolean("disable-explosion-knockback", false); } @@ -19,7 +19,7 @@ index fcbf8a2..b52e5c5 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9669389..ce087eb 100644 +index 966938997..ce087eb7d 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -428,7 +428,8 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -33,5 +33,5 @@ index 9669389..ce087eb 100644 l = this.l >> 2; blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch index 77588697d8..bfad17ad31 100644 --- a/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0039-Disable-ice-and-snow.patch @@ -1,14 +1,14 @@ -From 3f4a3864863d7b9d51a39ef674285fcf1a2696e1 Mon Sep 17 00:00:00 2001 +From dd3197ca93e9529ee5559f5f4f1764a53865af9b Mon Sep 17 00:00:00 2001 From: Sudzzy <[email protected]> Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b52e5c5..a6afdd3 100644 +index a40d4887c..4fea4b359 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -215,4 +215,9 @@ public class PaperWorldConfig { +@@ -209,4 +209,9 @@ public class PaperWorldConfig { private void disableThunder() { disableThunder = getBoolean("disable-thunder", false); } @@ -19,7 +19,7 @@ index b52e5c5..a6afdd3 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ce087eb..ac8dc5f 100644 +index ce087eb7d..ac8dc5f2f 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -451,7 +451,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -32,5 +32,5 @@ index ce087eb..ac8dc5f 100644 l = this.l >> 2; blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15))); -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch index 056c4acfb3..ab9b5dca46 100644 --- a/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch +++ b/Spigot-Server-Patches/0040-Configurable-mob-spawner-tick-rate.patch @@ -1,14 +1,14 @@ -From ffe94e57efe10e54ab3dde6ffff89854ffb3cc46 Mon Sep 17 00:00:00 2001 +From a4a8ef41f089714d6077958ed2931b4a9eedb92b Mon Sep 17 00:00:00 2001 From: Sudzzy <[email protected]> Date: Wed, 2 Mar 2016 15:03:53 -0600 Subject: [PATCH] Configurable mob spawner tick rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a6afdd3..57480f5 100644 +index 4fea4b359..1bb956515 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -220,4 +220,9 @@ public class PaperWorldConfig { +@@ -214,4 +214,9 @@ public class PaperWorldConfig { private void disableIceAndSnow(){ disableIceAndSnow = getBoolean("disable-ice-and-snow", false); } @@ -19,7 +19,7 @@ index a6afdd3..57480f5 100644 + } } diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 796b3e5..ce1db63 100644 +index 796b3e53f..ce1db632d 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -19,6 +19,7 @@ public abstract class MobSpawnerAbstract { @@ -64,5 +64,5 @@ index 796b3e5..ce1db63 100644 } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch index 5c1da11702..e6292518d1 100644 --- a/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch @@ -1,14 +1,14 @@ -From a2853b3936feb4cfc3ad6fa21e0b7a4dbb24ee51 Mon Sep 17 00:00:00 2001 +From 07032dd31eb190fc5371f1b47a699d67e18597b4 Mon Sep 17 00:00:00 2001 From: Sudzzy <[email protected]> Date: Wed, 2 Mar 2016 23:34:44 -0600 Subject: [PATCH] Configurable container update tick rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 57480f5..b2b94b8 100644 +index 1bb956515..e6aae7317 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -225,4 +225,9 @@ public class PaperWorldConfig { +@@ -219,4 +219,9 @@ public class PaperWorldConfig { private void mobSpawnerTickRate() { mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1); } @@ -19,7 +19,7 @@ index 57480f5..b2b94b8 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5717de3..e3a3ed4 100644 +index 485e1c3c7..d0e1de48a 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -66,6 +66,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -45,5 +45,5 @@ index 5717de3..e3a3ed4 100644 this.closeInventory(); this.activeContainer = this.defaultContainer; -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch b/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch index 50e2b06a79..1d52bd714f 100644 --- a/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch +++ b/Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch @@ -1,14 +1,14 @@ -From aed18d9a756c228540dab9234db0d182565262eb Mon Sep 17 00:00:00 2001 +From 3a2a233551b5789414804e0694d2a665419d26b5 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> 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 f509bed..259e3b7 100644 +index 0a6f9b256..18cabc4f3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -184,4 +184,9 @@ public class PaperConfig { +@@ -193,4 +193,9 @@ public class PaperConfig { " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) + " - Length: " + timeSummary(Timings.getHistoryLength() / 20)); } @@ -19,7 +19,7 @@ index f509bed..259e3b7 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java -index e4fd9bc..7b7a3d0 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 e4fd9bc..7b7a3d0 100644 private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS); -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch b/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch index 58cfb07421..74055b0979 100644 --- a/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch +++ b/Spigot-Server-Patches/0049-Disable-chest-cat-detection.patch @@ -1,14 +1,14 @@ -From 6a85f370b6f22ff909e7b4e3af7d3b4d906fc93a Mon Sep 17 00:00:00 2001 +From 122209091641313650c741bf1eb283ba4156a6cb Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Thu, 3 Mar 2016 01:13:45 -0600 Subject: [PATCH] Disable chest cat detection diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b2b94b8..97265b9 100644 +index e6aae7317..6ce62827a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -230,4 +230,9 @@ public class PaperWorldConfig { +@@ -224,4 +224,9 @@ public class PaperWorldConfig { private void containerUpdateTickRate() { containerUpdateTickRate = getInt("container-update-tick-rate", 1); } @@ -19,7 +19,7 @@ index b2b94b8..97265b9 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index d919d78..9d4c15f 100644 +index c75ed8a36..9c4d1c938 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -399,6 +399,11 @@ public class BlockChest extends BlockTileEntity { @@ -35,5 +35,5 @@ index d919d78..9d4c15f 100644 EntityOcelot entityocelot; -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch index 32f8fd631e..80b1f887fe 100644 --- a/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch +++ b/Spigot-Server-Patches/0050-Ensure-commands-are-not-ran-async.patch @@ -1,4 +1,4 @@ -From d2e3821f21b5bde3936bc82c0b365f489611db3e Mon Sep 17 00:00:00 2001 +From f53fc4b3d06bb6b236da8212307d9a9bc7c51eeb Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Thu, 3 Mar 2016 01:17:12 -0600 Subject: [PATCH] Ensure commands are not ran async @@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren that it is happening so that plugin authors can fix their code to stop executing commands async. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index db651f67..358d5d3b 100644 +index e19513a96..fd2c0c4f2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1259,6 +1259,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1267,6 +1267,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { } if (!async && s.startsWith("/")) { @@ -48,7 +48,7 @@ index db651f67..358d5d3b 100644 } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) { // Do nothing, this is coming from a plugin diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 30ed3ad5..a795a165 100644 +index 30ed3ad58..a795a165a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -647,6 +647,29 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch index d444306722..b89661c973 100644 --- a/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch +++ b/Spigot-Server-Patches/0051-All-chunks-are-slime-spawn-chunks-toggle.patch @@ -1,14 +1,14 @@ -From ac4241971063c677b4d465da7fef9a383fd37de5 Mon Sep 17 00:00:00 2001 +From e1bfe5c5182260e5cef5c0e2b8fa851a516fe174 Mon Sep 17 00:00:00 2001 From: vemacs <[email protected]> Date: Thu, 3 Mar 2016 01:19:22 -0600 Subject: [PATCH] All chunks are slime spawn chunks toggle diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 97265b9..b2c45c8 100644 +index 6ce62827a..ab7e81a0d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -235,4 +235,9 @@ public class PaperWorldConfig { +@@ -229,4 +229,9 @@ public class PaperWorldConfig { private void disableChestCatDetection() { disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false); } @@ -19,7 +19,7 @@ index 97265b9..b2c45c8 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 8fb14d6..c68429f 100644 +index 8fb14d6b5..c68429fb1 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -252,7 +252,8 @@ public class EntitySlime extends EntityInsentient implements IMonster { @@ -33,5 +33,5 @@ index 8fb14d6..c68429f 100644 } } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch index d3ca55e18b..89d7d1d7ca 100644 --- a/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch +++ b/Spigot-Server-Patches/0059-Add-configurable-portal-search-radius.patch @@ -1,14 +1,14 @@ -From 60c5846a56e80a3d1dbec352fbb9f58070736bff Mon Sep 17 00:00:00 2001 +From e508319d553bebb9f1c0ebcae8066ff53d1dd132 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld <[email protected]> Date: Thu, 3 Mar 2016 02:46:17 -0600 Subject: [PATCH] Add configurable portal search radius diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b2c45c8..ed63854 100644 +index ab7e81a0d..4cc74cd65 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -240,4 +240,9 @@ public class PaperWorldConfig { +@@ -234,4 +234,9 @@ public class PaperWorldConfig { private void allChunksAreSlimeChunks() { allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false); } @@ -19,7 +19,7 @@ index b2c45c8..ed63854 100644 + } } diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java -index 4455c2c..fbf7cff 100644 +index 4455c2c43..fbf7cff24 100644 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java @@ -12,7 +12,7 @@ import org.bukkit.util.Vector; @@ -41,7 +41,7 @@ index 4455c2c..fbf7cff 100644 return false; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java -index 1d5dce1..7ca2617 100644 +index 1d5dce10e..7ca2617a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftTravelAgent.java @@ -11,7 +11,7 @@ public class CraftTravelAgent extends PortalTravelAgent implements TravelAgent { @@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644 private boolean canCreatePortal = true; -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch b/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch index ce8e1e9b1d..2d956f8a8e 100644 --- a/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch +++ b/Spigot-Server-Patches/0061-Fix-inter-world-teleportation-glitches.patch @@ -1,4 +1,4 @@ -From 01b233180cee83148ca5bcd419a4e0834d7ddb86 Mon Sep 17 00:00:00 2001 +From 6ebe6765d70174e67fbfbe3af0e445fadf03c301 Mon Sep 17 00:00:00 2001 From: Sudzzy <[email protected]> Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Fix inter-world teleportation glitches @@ -11,10 +11,10 @@ Example setup to perform the glitch: http://puu.sh/ng3PC/cf072dcbdb.png The wanted destination was on top of the emerald block however the player ended on top of the diamond block. This only is the case if the player is teleporting between worlds. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ed63854..7005d69 100644 +index 4cc74cd65..fa49397ea 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -245,4 +245,9 @@ public class PaperWorldConfig { +@@ -239,4 +239,9 @@ public class PaperWorldConfig { private void portalSearchRadius() { portalSearchRadius = getInt("portal-search-radius", 128); } @@ -25,7 +25,7 @@ index ed63854..7005d69 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0e6e416..a1e46ef 100644 +index 2bcf3976f..68ce11be8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -579,7 +579,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -39,5 +39,5 @@ index 0e6e416..a1e46ef 100644 return true; } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch index c7ce977a55..6ee914e396 100644 --- a/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch +++ b/Spigot-Server-Patches/0064-Disable-Scoreboards-for-non-players-by-default.patch @@ -1,4 +1,4 @@ -From a463d6b3c11cd75c9a5ba0f5f7b895c5e45d7374 Mon Sep 17 00:00:00 2001 +From b241d53cbf704b2ef0edd30052700c8a4c42db3c Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Tue, 8 Mar 2016 23:25:45 -0500 Subject: [PATCH] Disable Scoreboards for non players by default @@ -11,10 +11,10 @@ So avoid looking up scoreboards and short circuit to the "not on a team" logic which is most likely to be true. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7005d69..b3678da 100644 +index fa49397ea..9987a5c7a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -250,4 +250,9 @@ public class PaperWorldConfig { +@@ -244,4 +244,9 @@ public class PaperWorldConfig { private void disableTeleportationSuffocationCheck() { disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false); } @@ -25,7 +25,7 @@ index 7005d69..b3678da 100644 + } } diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java -index 7af5d0a..ab9aa13 100644 +index 7af5d0aef..ab9aa132a 100644 --- a/src/main/java/net/minecraft/server/CommandScoreboard.java +++ b/src/main/java/net/minecraft/server/CommandScoreboard.java @@ -492,6 +492,7 @@ public class CommandScoreboard extends CommandAbstract { @@ -37,10 +37,10 @@ index 7af5d0a..ab9aa13 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 e8f5044..ced9d99 100644 +index 5b5e0e73c..be54c807b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1999,6 +1999,7 @@ public abstract class Entity implements ICommandListener { +@@ -2047,6 +2047,7 @@ public abstract class Entity implements ICommandListener { @Nullable public ScoreboardTeamBase aQ() { @@ -49,5 +49,5 @@ index e8f5044..ced9d99 100644 } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch index 185dc305a1..3d2d29290d 100644 --- a/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0066-Complete-resource-pack-API.patch @@ -1,14 +1,14 @@ -From e8e13c91dda2297f85ab4adc890637f4848409fe Mon Sep 17 00:00:00 2001 +From b30d84f0462ba70f3d1a46b71b7068be22a03127 Mon Sep 17 00:00:00 2001 From: Jedediah Smith <[email protected]> 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 358d5d3b..f30a9ad6 100644 +index fd2c0c4f2..e0cc33924 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1020,7 +1020,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1028,7 +1028,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // CraftBukkit start public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) { PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.x()); @@ -23,7 +23,7 @@ index 358d5d3b..f30a9ad6 100644 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a1e46efe..15da24d8 100644 +index 68ce11be8..923f81f23 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -74,6 +74,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -37,7 +37,7 @@ index a1e46efe..15da24d8 100644 public CraftPlayer(CraftServer server, EntityPlayer entity) { super(server, entity); -@@ -1570,6 +1574,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1571,6 +1575,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance); } diff --git a/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch b/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch index f623f2bd30..5f9dd76281 100644 --- a/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch +++ b/Spigot-Server-Patches/0067-Chunk-save-queue-improvements.patch @@ -1,4 +1,4 @@ -From b0e1a3ebf7a3ad709836a5edf63d391efc7f2d69 Mon Sep 17 00:00:00 2001 +From bc747b229be5a26b7dbb271ab1059394265750bf Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Fri, 4 Mar 2016 18:18:37 -0600 Subject: [PATCH] Chunk save queue improvements @@ -26,10 +26,10 @@ 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 259e3b7..c1a8243 100644 +index 18cabc4f3..797f794de 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -189,4 +189,10 @@ public class PaperConfig { +@@ -198,4 +198,10 @@ public class PaperConfig { private static void chunkLoadThreads() { minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6 } @@ -41,7 +41,7 @@ index 259e3b7..c1a8243 100644 + } } diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 9468c5e..b189ee4 100644 +index 79cb3953b..7f3e874ba 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -12,14 +12,17 @@ import java.util.Map; @@ -153,7 +153,7 @@ index 9468c5e..b189ee4 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java -index acfdd52..fdbaf5f 100644 +index acfdd52dc..fdbaf5fbd 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 { @@ -177,5 +177,5 @@ index acfdd52..fdbaf5f 100644 if (this.b.isEmpty()) { -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch index 754df1bdd7..e46f5613b7 100644 --- a/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0069-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From 057e2622c79809d9cdf41b2ee46117c09af465c2 Mon Sep 17 00:00:00 2001 +From c46e7e9b82220d05b4b3a3e8c33c1aaef69210fd Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Fri, 18 Mar 2016 13:17:38 -0400 Subject: [PATCH] Default loading permissions.yml before plugins @@ -16,10 +16,10 @@ 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 65fc0cb..7da844e 100644 +index 797f794de..7f02ac219 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -195,4 +195,9 @@ public class PaperConfig { +@@ -204,4 +204,9 @@ public class PaperConfig { enableFileIOThreadSleep = getBoolean("settings.sleep-between-chunk-saves", false); if (enableFileIOThreadSleep) Bukkit.getLogger().info("Enabled sleeping between chunk saves, beware of memory issues"); } @@ -30,7 +30,7 @@ index 65fc0cb..7da844e 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c61752b..e2afd9d 100644 +index c61752bc3..e2afd9d93 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -318,6 +318,7 @@ public final class CraftServer implements Server { @@ -51,5 +51,5 @@ index c61752b..e2afd9d 100644 CraftDefaultPermissions.registerCorePermissions(); helpMap.initializeCommands(); -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0072-Undead-horse-leashing.patch b/Spigot-Server-Patches/0072-Undead-horse-leashing.patch index 4f11fb965c..143e693675 100644 --- a/Spigot-Server-Patches/0072-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0072-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From 1e899a5dc8e3b0a2a2890efe028aa4e3446d721d Mon Sep 17 00:00:00 2001 +From 95eb6bb990200c2bf1bdf929443034e3ab460f9c Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing @@ -6,10 +6,10 @@ Subject: [PATCH] Undead horse leashing default false to match vanilla, but option to allow undead horse types to be leashed. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b3678da..029eb39 100644 +index 9987a5c7a..0873febb6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -255,4 +255,9 @@ public class PaperWorldConfig { +@@ -249,4 +249,9 @@ public class PaperWorldConfig { private void nonPlayerEntitiesOnScoreboards() { nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false); } @@ -20,7 +20,7 @@ index b3678da..029eb39 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index d74ccd6..3416c7a 100644 +index d74ccd68d..3416c7a7d 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -115,7 +115,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -33,5 +33,5 @@ index d74ccd6..3416c7a 100644 protected void q(float f) { -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch index ce7d2f06bf..44a6ae37bf 100644 --- a/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From 00cc28aaa400c28ac06cbaecf0220a12b25fa3ed Mon Sep 17 00:00:00 2001 +From 0f7207a38a3d9ac2b2c0a62696792a6c35256cc1 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Fri, 18 Mar 2016 15:12:22 -0400 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate @@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate Can set a much shorter despawn rate for arrows that players can not pick up. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 029eb39..9cce672 100644 +index 0873febb6..b37b5901b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -260,4 +260,13 @@ public class PaperWorldConfig { +@@ -254,4 +254,13 @@ public class PaperWorldConfig { private void allowLeashingUndeadHorse() { allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false); } @@ -24,7 +24,7 @@ index 029eb39..9cce672 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 65689f2..8cda475 100644 +index 65689f26d..8cda47518 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 65689f2..8cda475 100644 } } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0080-Set-health-before-death-event.patch b/Spigot-Server-Patches/0080-Set-health-before-death-event.patch index 896de9351a..6b1f05f162 100644 --- a/Spigot-Server-Patches/0080-Set-health-before-death-event.patch +++ b/Spigot-Server-Patches/0080-Set-health-before-death-event.patch @@ -1,14 +1,14 @@ -From 32280fdab148d7273e5b8c88550d52ef382940a6 Mon Sep 17 00:00:00 2001 +From 22251c19e0a10fa2073fa1e2d3c9e7641c652396 Mon Sep 17 00:00:00 2001 From: Jedediah Smith <[email protected]> Date: Sun, 19 Jul 2015 16:51:38 -0400 Subject: [PATCH] Set health before death event diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 7da844e43..4103d4966 100644 +index 7f02ac219..0b4468726 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -200,4 +200,9 @@ public class PaperConfig { +@@ -209,4 +209,9 @@ public class PaperConfig { private static void loadPermsBeforePlugins() { loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true); } @@ -19,7 +19,7 @@ index 7da844e43..4103d4966 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index eeb4f5b32..b7e832f31 100644 +index 348a8c758..c0103cb39 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -102,11 +102,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -45,5 +45,5 @@ index eeb4f5b32..b7e832f31 100644 public double getMaxHealth() { -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0081-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 index 864eba92e6..43e0dec4a1 100644 --- a/Spigot-Server-Patches/0081-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,11 +1,11 @@ -From 77eab3f73c96150488b72d734b82099d469c279b Mon Sep 17 00:00:00 2001 +From e1edb49d9f186def10618afca0b8135bb2c4d326 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index e8efb18..3f315d0 100644 +index 9cb3b22fb..c70f14a15 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -481,7 +481,13 @@ public abstract class EntityLiving extends Entity { @@ -44,10 +44,10 @@ index e8efb18..3f315d0 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 15da24d..de8952e 100644 +index 923f81f23..b2fe1afc0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1408,6 +1408,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1409,6 +1409,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } public void setRealHealth(double health) { @@ -56,5 +56,5 @@ index 15da24d..de8952e 100644 } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch index f06768043c..4d670ba20b 100644 --- a/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0087-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From ecc1080893b27f56397aa89f5bf4dc5db3eefd5e Mon Sep 17 00:00:00 2001 +From a267b336205e376738ec0237266113100ab3a981 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> 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 35afebd..a2814e1 100644 +index 42bd79b10..70a431a63 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2269,7 +2269,7 @@ public abstract class Entity implements ICommandListener { +@@ -2317,7 +2317,7 @@ public abstract class Entity implements ICommandListener { } public Entity teleportTo(Location exit, boolean portal) { @@ -20,5 +20,5 @@ index 35afebd..a2814e1 100644 WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle(); int i = worldserver1.dimension; -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch index 18b02d34df..92b3ddc339 100644 --- a/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0089-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,14 +1,14 @@ -From 4d062dbe2088771c29d59322d7386cc77d045b5a Mon Sep 17 00:00:00 2001 +From ebd168135f9e0b79d5718dbacb5021290c813218 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 9cce672..d92ccc7 100644 +index b37b5901b..adc810720 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -269,4 +269,9 @@ public class PaperWorldConfig { +@@ -263,4 +263,9 @@ public class PaperWorldConfig { } log("Non Player Arrow Despawn Rate: " + nonPlayerArrowDespawnRate); } @@ -19,7 +19,7 @@ index 9cce672..d92ccc7 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ac8dc5f..39ed0d5 100644 +index ac8dc5f2f..39ed0d533 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -436,7 +436,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -32,5 +32,5 @@ index ac8dc5f..39ed0d5 100644 entityhorseskeleton.p(true); -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 7a6208ae29..752663b00b 100644 --- a/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -1,4 +1,4 @@ -From 02f6cc91e81fa17215f3085fdd97283b211ed33f Mon Sep 17 00:00:00 2001 +From 4d9763586eab9522a87d6e37e6411695212ce774 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Thu, 3 Mar 2016 02:07:55 -0600 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling @@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward. Optimize getType and getBlockData to manually inline and optimize the calls diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index d60e7550..f772c7cd 100644 +index d60e75502..f772c7cdf 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> { @@ -31,7 +31,7 @@ index d60e7550..f772c7cd 100644 public BaseBlockPosition(int i, int j, int k) { this.a = i; diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 67b476b2..008ed206 100644 +index 67b476b22..008ed206d 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition { @@ -52,7 +52,7 @@ index 67b476b2..008ed206 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 8f1a68d6..736fa1f6 100644 +index 8f1a68d67..736fa1f62 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -406,11 +406,26 @@ public class Chunk { @@ -85,7 +85,7 @@ index 8f1a68d6..736fa1f6 100644 IBlockData iblockdata = null; diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 3d784d0d..afdc4a77 100644 +index 3d784d0dc..afdc4a779 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -5,7 +5,7 @@ public class ChunkSection { @@ -98,7 +98,7 @@ index 3d784d0d..afdc4a77 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 1523301c..3fca13d3 100644 +index 1d2d174e8..9427fc080 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -273,12 +273,12 @@ public abstract class World implements IBlockAccess { @@ -227,7 +227,7 @@ index 1523301c..3fca13d3 100644 public boolean B() { return this.J < 4; -@@ -2016,7 +2025,7 @@ public abstract class World implements IBlockAccess { +@@ -2017,7 +2026,7 @@ public abstract class World implements IBlockAccess { public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap(); @Nullable public TileEntity getTileEntity(BlockPosition blockposition) { @@ -236,7 +236,7 @@ index 1523301c..3fca13d3 100644 return null; } else { // CraftBukkit start -@@ -2057,7 +2066,7 @@ public abstract class World implements IBlockAccess { +@@ -2058,7 +2067,7 @@ public abstract class World implements IBlockAccess { } public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) { @@ -245,7 +245,7 @@ index 1523301c..3fca13d3 100644 if (tileentity != null && !tileentity.y()) { // CraftBukkit start if (captureBlockStates) { -@@ -2120,7 +2129,7 @@ public abstract class World implements IBlockAccess { +@@ -2121,7 +2130,7 @@ public abstract class World implements IBlockAccess { } public boolean d(BlockPosition blockposition, boolean flag) { diff --git a/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch index f56149b02b..68307dc463 100644 --- a/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch +++ b/Spigot-Server-Patches/0094-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch @@ -1,4 +1,4 @@ -From 891b22e04fed34d3d01c8c5d7c0aabbe21bef5eb Mon Sep 17 00:00:00 2001 +From 493bc62d5f87dc0fe5cbab3abe12a769733aaf4f Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone @@ -11,10 +11,10 @@ Defaulting this to false will provide substantial performance improvement by saving millions of event calls on redstone heavy servers. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d92ccc7..298c48f 100644 +index adc810720..e706efff5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -274,4 +274,9 @@ public class PaperWorldConfig { +@@ -268,4 +268,9 @@ public class PaperWorldConfig { private void skeleHorseSpawnChance() { skeleHorseSpawnChance = getDouble("skeleton-horse-thunder-spawn-chance", 0.01D); // -1.0D represents a "vanilla" state } @@ -25,7 +25,7 @@ index d92ccc7..298c48f 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index df48212..3715438 100644 +index 9427fc080..8cbdbda92 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -578,7 +578,7 @@ public abstract class World implements IBlockAccess { @@ -38,7 +38,7 @@ index df48212..3715438 100644 this.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 39ed0d5..f969d2a 100644 +index 39ed0d533..f969d2a72 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -34,6 +34,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; @@ -67,5 +67,5 @@ index 39ed0d5..f969d2a 100644 timing.stopTiming(); // Paper } else { -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch b/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch index 47eb01efc2..99f28a3c41 100644 --- a/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch +++ b/Spigot-Server-Patches/0096-Configurable-Chunk-Inhabited-Timer.patch @@ -1,4 +1,4 @@ -From de134ec4838b131a802ae6e75f7d805bb54b0566 Mon Sep 17 00:00:00 2001 +From 84cc380bde2c514ea83de852c8086d4da03a5c2d Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Timer @@ -9,10 +9,10 @@ aspects of vanilla gameplay to this factor. For people who want all chunks to be treated equally, you can disable the timer. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 298c48f..b99aa6b 100644 +index e706efff5..2c682ccf7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -279,4 +279,9 @@ public class PaperWorldConfig { +@@ -273,4 +273,9 @@ public class PaperWorldConfig { private void firePhysicsEventForRedstone() { firePhysicsEventForRedstone = getBoolean("fire-physics-event-for-redstone", firePhysicsEventForRedstone); } @@ -23,7 +23,7 @@ index 298c48f..b99aa6b 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 736fa1f..61d34fc 100644 +index 736fa1f62..61d34fc37 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1405,7 +1405,7 @@ public class Chunk { @@ -36,5 +36,5 @@ index 736fa1f..61d34fc 100644 public void c(long i) { -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch index 9e7fab42ec..6319d2ee8a 100644 --- a/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/Spigot-Server-Patches/0100-Sanitise-RegionFileCache-and-make-configurable.patch @@ -1,4 +1,4 @@ -From fd306dc01da01d4bbcaa757e79a5bfacfad90509 Mon Sep 17 00:00:00 2001 +From cf6994bcd2c15ead93ab8949c558846e981e0da1 Mon Sep 17 00:00:00 2001 From: Antony Riley <[email protected]> Date: Tue, 29 Mar 2016 08:22:55 +0300 Subject: [PATCH] Sanitise RegionFileCache and make configurable. @@ -11,10 +11,10 @@ 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 a60aee6..1b9c852 100644 +index 0b4468726..ab796a959 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -205,4 +205,9 @@ public class PaperConfig { +@@ -214,4 +214,9 @@ public class PaperConfig { private static void healthDeath() { setHealthBeforeDeathEvent = getBoolean("settings.set-health-before-death-event", false); } @@ -25,7 +25,7 @@ index a60aee6..1b9c852 100644 + } } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 19fbf9b..ad00c39 100644 +index 19fbf9b4a..ad00c39ce 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 19fbf9b..ad00c39 100644 Iterator iterator = RegionFileCache.a.values().iterator(); -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch index c7dee24b82..833ecaede2 100644 --- a/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0103-Add-PlayerUseUnknownEntityEvent.patch @@ -1,11 +1,11 @@ -From 97a4cb72849a21f4add6fbe16a2c5647af13cd52 Mon Sep 17 00:00:00 2001 +From 7bf4fe352ceae35bf946e88ff95cda1953035997 Mon Sep 17 00:00:00 2001 From: Jedediah Smith <[email protected]> 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 c67cb54..521f462 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,10 +18,10 @@ index c67cb54..521f462 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 48d64b3..6fe870f 100644 +index e0cc33924..c5fd65d27 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1605,6 +1605,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1613,6 +1613,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { } } } @@ -39,5 +39,5 @@ index 48d64b3..6fe870f 100644 } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch index b37c4e0a1f..c35230cb34 100644 --- a/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch +++ b/Spigot-Server-Patches/0105-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,14 +1,14 @@ -From bd93ff035dfafc92136f585f5c873592e30ee886 Mon Sep 17 00:00:00 2001 +From 669d20a0f61682186a2e540b525f8c9974bd4261 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Sun, 3 Apr 2016 16:28:17 -0400 Subject: [PATCH] Configurable Grass Spread Tick Rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b99aa6b..615a6af 100644 +index 2c682ccf7..74a49a5fb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -284,4 +284,10 @@ public class PaperWorldConfig { +@@ -278,4 +278,10 @@ public class PaperWorldConfig { private void useInhabitedTime() { useInhabitedTime = getBoolean("use-chunk-inhabited-timer", true); } @@ -20,7 +20,7 @@ index b99aa6b..615a6af 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java -index 8b43e60..5cbc95f 100644 +index 8b43e6070..5cbc95f7c 100644 --- a/src/main/java/net/minecraft/server/BlockGrass.java +++ b/src/main/java/net/minecraft/server/BlockGrass.java @@ -28,6 +28,7 @@ public class BlockGrass extends Block implements IBlockFragilePlantElement { @@ -32,5 +32,5 @@ index 8b43e60..5cbc95f 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.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 8e8095a953..b40cbd386e 100644 --- a/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 9bd768eb024594ce6921d483eb2ecdeb2e59ccf1 Mon Sep 17 00:00:00 2001 +From 18820f409c629725e0c0bd5df067b8dc832a3330 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world @@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world This lets you disable it for some worlds and lower it for others. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 615a6af9..6517c322 100644 +index 74a49a5fb..3a942c763 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -290,4 +290,10 @@ public class PaperWorldConfig { +@@ -284,4 +284,10 @@ public class PaperWorldConfig { grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate)); log("Grass Spread Tick Rate: " + grassUpdateRate); } @@ -21,7 +21,7 @@ index 615a6af9..6517c322 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3b67ff52..33d23f4b 100644 +index 3b67ff52e..33d23f4b2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -356,8 +356,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -39,10 +39,10 @@ index 3b67ff52..33d23f4b 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 b38a4f12..3ef58f39 100644 +index 7e6459654..dba3fb167 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -3193,8 +3193,9 @@ public abstract class World implements IBlockAccess { +@@ -3194,8 +3194,9 @@ public abstract class World implements IBlockAccess { int k = i * 16 + 8 - blockposition.getX(); int l = j * 16 + 8 - blockposition.getZ(); boolean flag = true; @@ -54,7 +54,7 @@ index b38a4f12..3ef58f39 100644 public void a(Packet<?> packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 540d5785..8cb8cbe2 100644 +index 540d57855..8cb8cbe2d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -952,7 +952,7 @@ public final class CraftServer implements Server { @@ -67,7 +67,7 @@ index 540d5785..8cb8cbe2 100644 for (int j = -short1; j <= short1; j += 16) { for (int k = -short1; k <= short1; k += 16) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index f65611a6..9965235a 100644 +index f65611a6a..9965235ab 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1265,8 +1265,9 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch b/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch index 5944acb355..0cea03782b 100644 --- a/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch +++ b/Spigot-Server-Patches/0108-Don-t-spam-reload-spawn-chunks-in-nether-end.patch @@ -1,14 +1,14 @@ -From f598f947d03f1a94dfd8d801737000f96d4d1a4b Mon Sep 17 00:00:00 2001 +From 1ab32d14164cb542312813d5960c989c4e7eb7ed Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> 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 358c1d43..bad504fe 100644 +index 44108ab9a..9bc8ce64c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -3189,6 +3189,7 @@ public abstract class World implements IBlockAccess { +@@ -3190,6 +3190,7 @@ public abstract class World implements IBlockAccess { return this.N; } @@ -17,7 +17,7 @@ index 358c1d43..bad504fe 100644 BlockPosition blockposition = this.getSpawn(); int k = i * 16 + 8 - blockposition.getX(); diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java -index a27512c0..4691b3d8 100644 +index a27512c0f..4691b3d8f 100644 --- a/src/main/java/net/minecraft/server/WorldProvider.java +++ b/src/main/java/net/minecraft/server/WorldProvider.java @@ -138,6 +138,6 @@ public abstract class WorldProvider { diff --git a/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index 02ce8af952..6f17024569 100644 --- a/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/0110-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -1,14 +1,14 @@ -From ede0ecaed35ed9d970a7962c63b315ff5b26a7c8 Mon Sep 17 00:00:00 2001 +From 5ef75a37faa4b05d824a5a032a82ea06c21459cc Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Wed, 6 Apr 2016 01:04:23 -0500 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6517c32..ea254a7 100644 +index 3a942c763..3bd29650c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -296,4 +296,9 @@ public class PaperWorldConfig { +@@ -290,4 +290,9 @@ public class PaperWorldConfig { keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16); log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16)); } @@ -19,10 +19,10 @@ index 6517c32..ea254a7 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ac10fec..ae6638d 100644 +index 70a431a63..8908d8b8d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1998,6 +1998,7 @@ public abstract class Entity implements ICommandListener { +@@ -2046,6 +2046,7 @@ public abstract class Entity implements ICommandListener { return this.getFlag(5); } @@ -31,10 +31,10 @@ index ac10fec..ae6638d 100644 public ScoreboardTeamBase aQ() { if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6fe870f..845c2fb 100644 +index c5fd65d27..6dfeb9be9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1338,7 +1338,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1346,7 +1346,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { return; } @@ -51,5 +51,5 @@ index 6fe870f..845c2fb 100644 if (((LazyPlayerSet) event.getRecipients()).isLazy()) { for (Object recipient : minecraftServer.getPlayerList().players) { -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch index b604911f0b..d9d361cf4a 100644 --- a/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0112-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From 343c8a21870ca24ee63f503631d024b4fc6ef12d Mon Sep 17 00:00:00 2001 +From 34bd14616e9dc48f3dd5fc05a5067b9a40a74ae7 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> 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 bad504fe..0c44377f 100644 +index 9bc8ce64c..2f4728b0d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess { @@ -57,7 +57,7 @@ index bad504fe..0c44377f 100644 this.tileEntityListTick.add(tileentity); } -@@ -2113,7 +2113,7 @@ public abstract class World implements IBlockAccess { +@@ -2114,7 +2114,7 @@ public abstract class World implements IBlockAccess { } else { if (tileentity != null) { this.b.remove(tileentity); diff --git a/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch index ec50d21593..08fc835519 100644 --- a/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0114-Configurable-Player-Collision.patch @@ -1,14 +1,14 @@ -From 0e395e58dade2e2186bb39d49d6188644684bdb1 Mon Sep 17 00:00:00 2001 +From b3febbc715ff0c9d2ba5e1cd6e3b64e90b60f9be Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 70f7c876d..6d0ea1939 100644 +index ab796a959..e823f5979 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 { +@@ -219,4 +219,9 @@ public class PaperConfig { private static void regionFileCacheSize() { regionFileCacheSize = getInt("settings.region-file-cache-size", 256); } @@ -37,7 +37,7 @@ index ab9aa132a..f9f59e559 100644 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index abffaedbe..b9d4d65a6 100644 +index 33d23f4b2..988439a0a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -331,6 +331,20 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -132,5 +132,5 @@ index a55a6fca0..be67df061 100644 // CraftBukkit start -- -2.11.0.windows.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch index 5760651e16..43ff689136 100644 --- a/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch @@ -1,11 +1,11 @@ -From e3f54d74fe213cbfb28b5e180693369a4ab8c634 Mon Sep 17 00:00:00 2001 +From 289c59814fb005e552bbd8df0f3bed5f88479bf4 Mon Sep 17 00:00:00 2001 From: Isaac Moore <[email protected]> Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 29ad8e2..f07c3de 100644 +index d0e1de48a..80b313b47 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -29,7 +29,7 @@ import org.bukkit.inventory.MainHand; @@ -34,10 +34,10 @@ index 29ad8e2..f07c3de 100644 this.ch = packetplayinsettings.d(); this.getDataWatcher().set(EntityPlayer.bq, Byte.valueOf((byte) packetplayinsettings.e())); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3b91e46..84b2e54 100644 +index a74d6c768..a2fb7d2be 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1701,7 +1701,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1702,7 +1702,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public String getLocale() { @@ -50,5 +50,5 @@ index 3b91e46..84b2e54 100644 @Override -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch index 93c4ce0a60..7c9318edf4 100644 --- a/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/0122-Add-ability-to-configure-frosted_ice-properties.patch @@ -1,14 +1,14 @@ -From c461161442b20dbd1470028cb7c1bcae878ada7b Mon Sep 17 00:00:00 2001 +From 13ba82e13961f9192690d82d07a566b48bae222e Mon Sep 17 00:00:00 2001 From: kashike <[email protected]> Date: Thu, 21 Apr 2016 23:51:55 -0700 Subject: [PATCH] Add ability to configure frosted_ice properties diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ea254a7..75260d4 100644 +index 3bd29650c..5cc55b794 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -301,4 +301,14 @@ public class PaperWorldConfig { +@@ -295,4 +295,14 @@ public class PaperWorldConfig { private void useVanillaScoreboardColoring() { useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false); } @@ -20,11 +20,11 @@ index ea254a7..75260d4 100644 + this.frostedIceEnabled = this.getBoolean("frosted-ice.enabled", this.frostedIceEnabled); + this.frostedIceDelayMin = this.getInt("frosted-ice.delay.min", this.frostedIceDelayMin); + this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax); -+ this.log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax); ++ log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax); + } } diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java -index 7385582..f079c33 100644 +index 73855826e..f079c3389 100644 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java @@ -19,10 +19,14 @@ public class BlockIceFrost extends BlockIce { @@ -44,5 +44,5 @@ index 7385582..f079c33 100644 } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch index bae6c970a0..e3aabb05d7 100644 --- a/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch +++ b/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch @@ -1,11 +1,11 @@ -From 6019d4c635401d142da1f6a03287e936109deb9f Mon Sep 17 00:00:00 2001 +From 2ca1f747abed74dc85b59b9688dd3ef238d3774c Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> 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 ae6638d..0818ff8 100644 +index 8908d8b8d..0f4a1b66b 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 { @@ -17,7 +17,7 @@ index ae6638d..0818ff8 100644 public boolean attachedToPlayer; public World world; public double lastX; -@@ -1880,6 +1880,7 @@ public abstract class Entity implements ICommandListener { +@@ -1928,6 +1928,7 @@ public abstract class Entity implements ICommandListener { throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)"); } else { // CraftBukkit start @@ -25,7 +25,7 @@ index ae6638d..0818ff8 100644 CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle(); Entity orig = craft == null ? null : craft.getHandle(); if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) { -@@ -1895,7 +1896,13 @@ public abstract class Entity implements ICommandListener { +@@ -1943,7 +1944,13 @@ public abstract class Entity implements ICommandListener { } } // CraftBukkit end @@ -41,5 +41,5 @@ index ae6638d..0818ff8 100644 entity.j = 60; } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch index bf534de0bc..ae35de7207 100644 --- a/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0128-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From e2f1cdfbc94d11d1995fab5d6e5a029b9812e882 Mon Sep 17 00:00:00 2001 +From ab7d2ed6e59a26fbeaa0b65451e7ae783824e610 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Sun, 1 May 2016 21:19:14 -0400 Subject: [PATCH] LootTable API & Replenishable Lootables Feature @@ -11,12 +11,12 @@ This feature is good for long term worlds so that newer players do not suffer with "Every chest has been looted" diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 75260d4..4d6a309 100644 +index 5cc55b794..fbe769eb3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -311,4 +311,26 @@ public class PaperWorldConfig { +@@ -305,4 +305,26 @@ public class PaperWorldConfig { this.frostedIceDelayMax = this.getInt("frosted-ice.delay.max", this.frostedIceDelayMax); - this.log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax); + log("Frosted Ice: " + (this.frostedIceEnabled ? "enabled" : "disabled") + " / delay: min=" + this.frostedIceDelayMin + ", max=" + this.frostedIceDelayMax); } + + public boolean autoReplenishLootables; @@ -43,7 +43,7 @@ index 75260d4..4d6a309 100644 } diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java new file mode 100644 -index 0000000..36c36d1 +index 000000000..36c36d158 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java @@ -0,0 +1,12 @@ @@ -61,7 +61,7 @@ index 0000000..36c36d1 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java new file mode 100644 -index 0000000..20d236c +index 000000000..20d236c45 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java @@ -0,0 +1,33 @@ @@ -100,7 +100,7 @@ index 0000000..20d236c +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java new file mode 100644 -index 0000000..1150dee +index 000000000..1150dee01 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java @@ -0,0 +1,31 @@ @@ -137,7 +137,7 @@ index 0000000..1150dee +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java new file mode 100644 -index 0000000..6680976 +index 000000000..668097620 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java @@ -0,0 +1,88 @@ @@ -231,7 +231,7 @@ index 0000000..6680976 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java new file mode 100644 -index 0000000..01c2713 +index 000000000..01c2713d3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java @@ -0,0 +1,182 @@ @@ -418,7 +418,7 @@ index 0000000..01c2713 + } +} diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java -index a799196..965aa5c 100644 +index a79919696..965aa5c23 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java @@ -6,17 +6,21 @@ import javax.annotation.Nullable; @@ -536,7 +536,7 @@ index a799196..965aa5c 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java -index 5632f2e..01d0d80 100644 +index 5632f2e78..01d0d8071 100644 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java @@ -1,44 +1,50 @@ @@ -653,7 +653,7 @@ index 5632f2e..01d0d80 100644 + } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java -index 3de7e14..6cab545 100644 +index 3de7e14d8..6cab545e5 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java @@ -1,5 +1,6 @@ @@ -673,7 +673,7 @@ index 3de7e14..6cab545 100644 private final TileEntityChest chest; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java -index cc0d28f..1b28e8b 100644 +index cc0d28f21..1b28e8ba2 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java @@ -1,5 +1,6 @@ @@ -693,7 +693,7 @@ index cc0d28f..1b28e8b 100644 private final TileEntityDispenser dispenser; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java -index b7a04bd..5d4a551 100644 +index b7a04bd84..5d4a5519d 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java @@ -1,5 +1,6 @@ @@ -713,7 +713,7 @@ index b7a04bd..5d4a551 100644 public CraftHopper(final Block block) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java -index 8a7ce92b..02f56bc 100644 +index 8a7ce92bf..02f56bc0d 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java @@ -1,5 +1,6 @@ @@ -742,7 +742,7 @@ index 8a7ce92b..02f56bc 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java -index 69435c4..4291edf 100644 +index 69435c457..4291edf25 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java @@ -1,5 +1,6 @@ @@ -762,7 +762,7 @@ index 69435c4..4291edf 100644 public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java -index e9963e2..acb4dee 100644 +index e9963e21c..acb4dee04 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java @@ -1,5 +1,6 @@ @@ -782,5 +782,5 @@ index e9963e2..acb4dee 100644 CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) { -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index edd6d02abb..fbfccb2672 100644 --- a/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/0131-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,14 +1,14 @@ -From 581e3986dc0ec5a6f0c110ca00a2c6c91c0f0c80 Mon Sep 17 00:00:00 2001 +From 21d2326939519499425791960d09360897ea5178 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Sat, 7 May 2016 23:33:08 -0400 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 6d0ea19..5c9ea0f 100644 +index e823f5979..923cc2b5c 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 { +@@ -224,4 +224,9 @@ public class PaperConfig { private static void enablePlayerCollisions() { enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true); } @@ -19,7 +19,7 @@ index 6d0ea19..5c9ea0f 100644 + } } diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java -index 230004b..62752f8 100644 +index 230004b4a..62752f816 100644 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java @@ -184,6 +184,7 @@ public class PersistentScoreboard extends PersistentBase { @@ -31,5 +31,5 @@ index 230004b..62752f8 100644 nbttagcompound.setString("Name", scoreboardteam.getName()); -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch b/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch index cf774df45e..46c7146ed9 100644 --- a/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch +++ b/Spigot-Server-Patches/0138-Optional-old-TNT-cannon-behaviors.patch @@ -1,14 +1,14 @@ -From fe215de8c00b2141d540df98b2253ef58d903221 Mon Sep 17 00:00:00 2001 +From cefcffaa0aa6f5c4779e8ba54a5681a4a72078fc Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional old TNT cannon behaviors diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4d6a309..2a4d1da 100644 +index fbe769eb3..c4acb7597 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -333,4 +333,12 @@ public class PaperWorldConfig { +@@ -327,4 +327,12 @@ public class PaperWorldConfig { ); } } @@ -22,7 +22,7 @@ index 4d6a309..2a4d1da 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockDiodeAbstract.java b/src/main/java/net/minecraft/server/BlockDiodeAbstract.java -index 59ee13d..40c9f18 100644 +index 59ee13de8..40c9f18bf 100644 --- a/src/main/java/net/minecraft/server/BlockDiodeAbstract.java +++ b/src/main/java/net/minecraft/server/BlockDiodeAbstract.java @@ -76,6 +76,17 @@ public abstract class BlockDiodeAbstract extends BlockFacingHorizontal { @@ -62,7 +62,7 @@ index 59ee13d..40c9f18 100644 int i = aenumdirection.length; diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java -index c7e095a..7412362 100644 +index c7e095a11..741236289 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java @@ -52,6 +52,12 @@ public class BlockRedstoneTorch extends BlockTorch { @@ -110,7 +110,7 @@ index c7e095a..7412362 100644 return this.isOn && iblockdata.get(BlockRedstoneTorch.FACING) != enumdirection ? 15 : 0; } diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 5a0f026..20b9465 100644 +index 5a0f026b1..20b9465e7 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -20,7 +20,7 @@ public class BlockRedstoneWire extends Block { @@ -160,7 +160,7 @@ index 5a0f026..20b9465 100644 int i = aenumdirection.length; diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java -index 6b6aa89..5cec416 100644 +index 6b6aa892a..5cec4160c 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -29,7 +29,11 @@ public class BlockTNT extends Block { @@ -190,10 +190,10 @@ index 6b6aa89..5cec416 100644 world.addEntity(entitytntprimed); world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gV, SoundCategory.BLOCKS, 1.0F, 1.0F); diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java -index 2762806..fcc3d10 100644 +index 6af9f206b..bec623c4d 100644 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java -@@ -481,7 +481,11 @@ public class DispenserRegistry { +@@ -507,7 +507,11 @@ public class DispenserRegistry { org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ()); CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1); @@ -207,10 +207,10 @@ index 2762806..fcc3d10 100644 world.getServer().getPluginManager().callEvent(event); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 47227ea..40a7df1 100644 +index 96b1e9a78..0d1fdd3ee 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1041,6 +1041,12 @@ public abstract class Entity implements ICommandListener { +@@ -1089,6 +1089,12 @@ public abstract class Entity implements ICommandListener { } public boolean ak() { @@ -223,7 +223,7 @@ index 47227ea..40a7df1 100644 if (this.bB() 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)) { -@@ -1244,6 +1250,12 @@ public abstract class Entity implements ICommandListener { +@@ -1292,6 +1298,12 @@ public abstract class Entity implements ICommandListener { } public double e(double d0, double d1, double d2) { @@ -236,7 +236,7 @@ index 47227ea..40a7df1 100644 double d3 = this.locX - d0; double d4 = this.locY - d1; double d5 = this.locZ - d2; -@@ -1298,6 +1310,11 @@ public abstract class Entity implements ICommandListener { +@@ -1346,6 +1358,11 @@ public abstract class Entity implements ICommandListener { } public void f(double d0, double d1, double d2) { @@ -248,7 +248,7 @@ index 47227ea..40a7df1 100644 this.motX += d0; this.motY += d1; this.motZ += d2; -@@ -2457,6 +2474,12 @@ public abstract class Entity implements ICommandListener { +@@ -2505,6 +2522,12 @@ public abstract class Entity implements ICommandListener { } public boolean bg() { @@ -262,7 +262,7 @@ index 47227ea..40a7df1 100644 } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 307a44c..bb01929 100644 +index 307a44c85..bb01929e8 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -280,4 +280,19 @@ public class EntityFallingBlock extends Entity { @@ -286,7 +286,7 @@ index 307a44c..bb01929 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java -index 25e471d..e796ade 100644 +index 25e471d37..e796ade87 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -32,6 +32,7 @@ public class EntityTNTPrimed extends Entity { @@ -366,7 +366,7 @@ index 25e471d..e796ade 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index d7bc6a0..f2785d8 100644 +index d7bc6a0ed..f2785d86c 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -149,9 +149,15 @@ public class Explosion { @@ -389,5 +389,5 @@ index d7bc6a0..f2785d8 100644 EntityHuman entityhuman = (EntityHuman) entity; -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch index 83fb6dabcd..949f82abd7 100644 --- a/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch +++ b/Spigot-Server-Patches/0143-Fix-FallingBlocks-being-stuck-on-fences.patch @@ -1,4 +1,4 @@ -From c4405c93da55c2ee40052894c0cedb2d7e0241bb Mon Sep 17 00:00:00 2001 +From de89b530131780b4ecccb3f8487c45ae17a4bd86 Mon Sep 17 00:00:00 2001 From: Martin Panzer <[email protected]> Date: Fri, 3 Jun 2016 23:13:39 +0200 Subject: [PATCH] Fix FallingBlocks being stuck on fences @@ -11,10 +11,10 @@ We now first check, if if we are already on the ground. if not, we check if the falling block is inside of the hitbox of the block at y - 1. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 2a4d1da..a57a397 100644 +index c4acb7597..7bd745a27 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -341,4 +341,9 @@ public class PaperWorldConfig { +@@ -335,4 +335,9 @@ public class PaperWorldConfig { log("Old Cannon Behaviors: This feature may not be working entirely properly at the moment"); } } @@ -25,7 +25,7 @@ index 2a4d1da..a57a397 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockFalling.java b/src/main/java/net/minecraft/server/BlockFalling.java -index dcdae99..3c77741 100644 +index dcdae998c..3c777418b 100644 --- a/src/main/java/net/minecraft/server/BlockFalling.java +++ b/src/main/java/net/minecraft/server/BlockFalling.java @@ -71,6 +71,12 @@ public class BlockFalling extends Block { @@ -42,7 +42,7 @@ index dcdae99..3c77741 100644 public void b(World world, BlockPosition blockposition) {} diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index bb01929..8059e6d 100644 +index bb01929e8..8059e6dcd 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -2,7 +2,9 @@ package net.minecraft.server; @@ -102,5 +102,5 @@ index bb01929..8059e6d 100644 Block block = this.block.getBlock(); -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch index 1921fccb93..141f565814 100644 --- a/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch +++ b/Spigot-Server-Patches/0144-Make-entities-look-for-hoppers.patch @@ -1,4 +1,4 @@ -From 6df97eceddc4d2b7550bdfef945b5cb047d4bf09 Mon Sep 17 00:00:00 2001 +From 7d7ec51f359de7ade5327fee113f9bd54de7bc67 Mon Sep 17 00:00:00 2001 From: Techcable <[email protected]> Date: Sat, 18 Jun 2016 01:01:37 -0500 Subject: [PATCH] Make entities look for hoppers @@ -78,10 +78,10 @@ index 000000000..aef7c2be9 + double getZ(); +} diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a57a3971f..b9b0f7479 100644 +index 7bd745a27..894d40662 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -346,4 +346,9 @@ public class PaperWorldConfig { +@@ -340,4 +340,9 @@ public class PaperWorldConfig { private void altFallingBlockOnGround() { altFallingBlockOnGround = getBoolean("use-alternate-fallingblock-onGround-detection", false); } @@ -132,7 +132,7 @@ 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 40a7df117..916d5e266 100644 +index 0d1fdd3ee..0479b7551 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 { diff --git a/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch index b4c964125c..16defb95b1 100644 --- a/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -1,4 +1,4 @@ -From 7c927385a687ca4e9e98a469e751ef27f0a508f7 Mon Sep 17 00:00:00 2001 +From 8113b5b2e2807dba7b504fc77d2f3242facd8240 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Sat, 18 Jun 2016 23:22:12 -0400 Subject: [PATCH] Delay Chunk Unloads based on Player Movement @@ -17,10 +17,10 @@ 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 b9b0f7479..cda516f6a 100644 +index 894d40662..04861f146 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -351,4 +351,13 @@ public class PaperWorldConfig { +@@ -345,4 +345,13 @@ public class PaperWorldConfig { private void isHopperPushBased() { isHopperPushBased = getBoolean("hopper.push-based", false); } @@ -140,5 +140,5 @@ index 9965235ab..3f8859a1f 100644 } -- -2.11.1.windows.1 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch b/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch index ab127fffb5..3c952f9623 100644 --- a/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch +++ b/Spigot-Server-Patches/0146-Toggleable-Elytra-Wall-Damage.patch @@ -1,4 +1,4 @@ -From a71d9adaff274d42ba791d20c656153d8d187aa5 Mon Sep 17 00:00:00 2001 +From 1898a57c9e314e3f567a4cdd40013c8c842bec94 Mon Sep 17 00:00:00 2001 From: Jadon Fowler <[email protected]> Date: Sat, 18 Jun 2016 23:13:59 -0700 Subject: [PATCH] Toggleable Elytra Wall Damage @@ -7,10 +7,10 @@ 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 cda516f..965edc9 100644 +index 04861f146..dc96bd7f4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -360,4 +360,9 @@ public class PaperWorldConfig { +@@ -354,4 +354,9 @@ public class PaperWorldConfig { delayChunkUnloadsBy *= 1000; } } @@ -21,7 +21,7 @@ index cda516f..965edc9 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 52b48ad..4ec6bc9 100644 +index ec901150d..b8ac99e5d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1690,6 +1690,7 @@ public abstract class EntityLiving extends Entity { @@ -41,5 +41,5 @@ index 52b48ad..4ec6bc9 100644 if (this.onGround && !this.world.isClientSide) { if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch index ee2d18480b..2618a34990 100644 --- a/Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0152-Add-setting-for-proxy-online-mode-status.patch @@ -1,14 +1,14 @@ -From 5a14f84b25e0316aaac5ca28325a20ad965a41b1 Mon Sep 17 00:00:00 2001 +From c12c1b6b1fd066616a0b895ade27aae62d5ae25a Mon Sep 17 00:00:00 2001 From: Gabriele C <[email protected]> Date: Fri, 5 Aug 2016 01:03:08 +0200 Subject: [PATCH] Add setting for proxy online mode status diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 5c9ea0f..b1aa228 100644 +index 923cc2b5c..c0a83cccb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -220,4 +220,9 @@ public class PaperConfig { +@@ -229,4 +229,9 @@ public class PaperConfig { private static void saveEmptyScoreboardTeams() { saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false); } @@ -19,7 +19,7 @@ index 5c9ea0f..b1aa228 100644 + } } diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java -index 2ff8a6d..52e7360 100644 +index 2ff8a6da0..52e736080 100644 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java @@ -65,7 +65,8 @@ public class NameReferencingFileConverter { @@ -33,7 +33,7 @@ index 2ff8a6d..52e7360 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 8cb8cbe..1bbce7a 100644 +index 8cb8cbe2d..1bbce7a78 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1336,7 +1336,8 @@ public final class CraftServer implements Server { @@ -47,5 +47,5 @@ index 8cb8cbe..1bbce7a 100644 profile = console.getUserCache().getProfile( name ); } -- -2.9.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch index c6f8045f10..7bc54723a2 100644 --- a/Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch +++ b/Spigot-Server-Patches/0155-Fix-AIOOBE-in-inventory-handling.patch @@ -1,14 +1,14 @@ -From 7765ad8bc7632664a0d4afbffe5b643d44f8e160 Mon Sep 17 00:00:00 2001 +From a9b75a383813f16c887bcccd04886b51f46bced3 Mon Sep 17 00:00:00 2001 From: Brokkonaut <[email protected]> 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 968c03911..6c73e9a87 100644 +index e01787021..a99ec1f10 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1800,7 +1800,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1808,7 +1808,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { case CLONE: if (packetplayinwindowclick.c() == 2) { click = ClickType.MIDDLE; @@ -18,5 +18,5 @@ index 968c03911..6c73e9a87 100644 } else { Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b()); -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch index e92e09f99c..51ac4aeae9 100644 --- a/Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch +++ b/Spigot-Server-Patches/0156-Configurable-packet-in-spam-threshold.patch @@ -1,14 +1,14 @@ -From f9b70ce9eaf7eb1987f577d079506ad14491141f Mon Sep 17 00:00:00 2001 +From bd16bfc6491d83cc41d41f94e273f401a0cd2404 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Sun, 11 Sep 2016 14:30:57 -0500 Subject: [PATCH] Configurable packet in spam threshold diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index b1aa228f3..3f5b4825e 100644 +index c0a83cccb..20f6742f4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -225,4 +225,13 @@ public class PaperConfig { +@@ -234,4 +234,13 @@ public class PaperConfig { private static void bungeeOnlineMode() { bungeeOnlineMode = getBoolean("settings.bungee-online-mode", true); } @@ -23,10 +23,10 @@ index b1aa228f3..3f5b4825e 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6c73e9a87..20147142c 100644 +index a99ec1f10..ef88d568b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -862,13 +862,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -870,13 +870,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // Spigot start - limit place/interactions private int limitedPackets; private long lastLimitedPacket = -1; @@ -44,5 +44,5 @@ index 6c73e9a87..20147142c 100644 limitedPackets = 0; return true; -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch index 86df8eaf67..20648d6009 100644 --- a/Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch +++ b/Spigot-Server-Patches/0157-Configurable-flying-kick-messages.patch @@ -1,14 +1,14 @@ -From cbfe52d1b9d165b323c1291736f1a141169271ff Mon Sep 17 00:00:00 2001 +From 5b1efd4134b7c1b99d864787b7831fb09ffe61d5 Mon Sep 17 00:00:00 2001 From: kashike <[email protected]> Date: Tue, 20 Sep 2016 00:58:01 +0000 Subject: [PATCH] Configurable flying kick messages diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 3f5b4825e..7018828bb 100644 +index 20f6742f4..cc0ae9224 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -234,4 +234,11 @@ public class PaperConfig { +@@ -243,4 +243,11 @@ public class PaperConfig { } packetInSpamThreshold = getInt("settings.incoming-packet-spam-threshold", 300); } @@ -21,7 +21,7 @@ index 3f5b4825e..7018828bb 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 20147142c..30726ae69 100644 +index ef88d568b..b7e1d84d4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -142,7 +142,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -43,5 +43,5 @@ index 20147142c..30726ae69 100644 } } else { -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch index ec06d7271f..3f6dd66f2c 100644 --- a/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch +++ b/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch @@ -1,4 +1,4 @@ -From 6e591544d4f86d070b9fe8ff07949aac9e38d6da Mon Sep 17 00:00:00 2001 +From 3a0addf1653cf2821958eeccea104b889a887798 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 19 Sep 2016 23:16:39 -0400 Subject: [PATCH] Auto Save Improvements @@ -12,10 +12,10 @@ 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 7018828bb..dcb971a17 100644 +index cc0ae9224..17102d95d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -241,4 +241,9 @@ public class PaperConfig { +@@ -250,4 +250,9 @@ public class PaperConfig { flyingKickPlayerMessage = getString("messages.kick.flying-player", flyingKickPlayerMessage); flyingKickVehicleMessage = getString("messages.kick.flying-vehicle", flyingKickVehicleMessage); } @@ -26,7 +26,7 @@ index 7018828bb..dcb971a17 100644 + } } diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 965edc99c..da530f9aa 100644 +index dc96bd7f4..bcf24cb49 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; @@ -37,7 +37,7 @@ index 965edc99c..da530f9aa 100644 import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; import org.spigotmc.SpigotWorldConfig; -@@ -365,4 +366,19 @@ public class PaperWorldConfig { +@@ -359,4 +360,19 @@ public class PaperWorldConfig { private void elytraHitWallDamage() { elytraHitWallDamage = getBoolean("elytra-hit-wall-damage", true); } @@ -76,7 +76,7 @@ index 88437d77a..9f7f32dc2 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 25deecc4d..770abb51d 100644 +index 0a8e09e5e..ad668be62 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -1,5 +1,6 @@ @@ -96,7 +96,7 @@ index 25deecc4d..770abb51d 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b5e386501..d67493666 100644 +index 93c4babd9..0cd350254 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -30,6 +30,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -108,7 +108,7 @@ index b5e386501..d67493666 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 4078824f7..e04bade5b 100644 +index f83cc7641..d49a4ded0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -118,6 +118,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -215,5 +215,5 @@ index f969d2a72..cc0e8d2c8 100644 timings.worldSaveChunks.startTiming(); // Paper chunkproviderserver.a(flag); -- -2.11.0.windows.3 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0159-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0159-Chunk-registration-fixes.patch index 59ba8cd89d..f8f7cc36ce 100644 --- a/Spigot-Server-Patches/0159-Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/0159-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From 2f9b6710969db1be24ea204412272757407d816e Mon Sep 17 00:00:00 2001 +From ec03d19d0058c6715aa40ce286a39874e91c7e3f Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Wed, 21 Sep 2016 22:54:28 -0400 Subject: [PATCH] Chunk registration fixes @@ -8,10 +8,10 @@ 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 4b6275a8..416c484b 100644 +index 7900fca57..ec0a28cff 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1762,7 +1762,7 @@ public abstract class World implements IBlockAccess { +@@ -1763,7 +1763,7 @@ public abstract class World implements IBlockAccess { } int k = MathHelper.floor(entity.locX / 16.0D); diff --git a/Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch index a08f43c6e5..709d6c5155 100644 --- a/Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch +++ b/Spigot-Server-Patches/0164-Option-to-remove-corrupt-tile-entities.patch @@ -1,14 +1,14 @@ -From bc529beac28d44e98cb027a1691f612ac33ef206 Mon Sep 17 00:00:00 2001 +From 844a32e4b5c8098e11cffcf31b3ab38f8a07ab8d Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Wed, 5 Oct 2016 16:27:36 -0500 Subject: [PATCH] Option to remove corrupt tile entities diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index da530f9aa..376b9eda3 100644 +index bcf24cb49..220ecaf8d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -381,4 +381,9 @@ public class PaperWorldConfig { +@@ -375,4 +375,9 @@ public class PaperWorldConfig { private void maxAutoSaveChunksPerTick() { maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24); } @@ -41,5 +41,5 @@ index 9f7f32dc2..d850dbfc3 100644 if (this.j) { TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition); -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch b/Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch index c61afd1cdd..2e5323e924 100644 --- a/Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch +++ b/Spigot-Server-Patches/0167-Prevent-Auto-Save-if-Save-Queue-is-full.patch @@ -1,4 +1,4 @@ -From 9a8322a9eab3f68a0b6396656bfdfa917a8936d2 Mon Sep 17 00:00:00 2001 +From 8b0b1e8d57a24165d619fe81b265c1c37bc364b0 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Thu, 3 Nov 2016 21:52:22 -0400 Subject: [PATCH] Prevent Auto Save if Save Queue is full @@ -7,10 +7,10 @@ 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 376b9eda3..4ad072ad8 100644 +index 220ecaf8d..4ca44afa9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -382,6 +382,11 @@ public class PaperWorldConfig { +@@ -376,6 +376,11 @@ public class PaperWorldConfig { maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24); } @@ -23,7 +23,7 @@ index 376b9eda3..4ad072ad8 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 5c5a56c51..b7afcb204 100644 +index ad668be62..916bf53f4 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 { @@ -63,5 +63,5 @@ index 19411212a..139f2799c 100644 ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j); -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index b6a88057b2..b0d0188e65 100644 --- a/Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/Spigot-Server-Patches/0169-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -1,14 +1,14 @@ -From ea606c2b1fe69dceefcbecdd3a296ac694e86e36 Mon Sep 17 00:00:00 2001 +From f66443a5a92b3c43d33dc57a78f3260712acdc18 Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> 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 4ad072ad8..73bf74422 100644 +index 4ca44afa9..dcf64efcc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -391,4 +391,12 @@ public class PaperWorldConfig { +@@ -385,4 +385,12 @@ public class PaperWorldConfig { private void removeCorruptTEs() { removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false); } @@ -61,5 +61,5 @@ index 1a01a57d2..f914ad417 100644 entity.f(nbttagcompound1); } -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch index a79a95321f..eaa4c041f3 100644 --- a/Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0180-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From 55ef237370676a3f8e7ac3a13d9fe05b01fba0ac Mon Sep 17 00:00:00 2001 +From a72bb434e157947dc177914fa0e6fc4093e4b8fe Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> 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 d12b7d87..a75f50ef 100644 +index 44fdf92ff..1e295432e 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 { @@ -18,7 +18,7 @@ index d12b7d87..a75f50ef 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 eb32871b..a380e615 100644 +index eb32871bd..a380e615b 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,10 +31,10 @@ index eb32871b..a380e615 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 d8c07768..eea9c598 100644 +index 2fa63a27f..7af76e14c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1798,6 +1798,33 @@ public abstract class World implements IBlockAccess { +@@ -1799,6 +1799,33 @@ public abstract class World implements IBlockAccess { return this.a(axisalignedbb, (Entity) null); } @@ -68,7 +68,7 @@ index d8c07768..eea9c598 100644 public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) { List list = this.getEntities((Entity) null, axisalignedbb); -@@ -2682,7 +2709,7 @@ public abstract class World implements IBlockAccess { +@@ -2683,7 +2710,7 @@ public abstract class World implements IBlockAccess { AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().c(this, blockposition); // CraftBukkit start - store default return @@ -78,7 +78,7 @@ index d8c07768..eea9c598 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 a850a963..59942d9c 100644 +index a850a9634..59942d9cb 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -799,6 +799,13 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch index a45cfe7669..25b441b26a 100644 --- a/Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0184-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From 5e91efb7e5cb6a3812d67220724b1b343ea142bd Mon Sep 17 00:00:00 2001 +From 8c70834575a03151ad00f7f4598cafe929479dd9 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps @@ -9,10 +9,10 @@ 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 73bf74422..a655b3310 100644 +index dcf64efcc..bf2916802 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -399,4 +399,14 @@ public class PaperWorldConfig { +@@ -393,4 +393,14 @@ public class PaperWorldConfig { Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk"); } } @@ -42,5 +42,5 @@ index 4ad75468c..ac6e2a9aa 100644 if (blockposition != null) { ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true); -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index 2a6995a5df..e7246d6ac6 100644 --- a/Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0187-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,14 +1,14 @@ -From 3788bfea0a0f0b8dd5f856e8fc97c1ba6417359f Mon Sep 17 00:00:00 2001 +From 5d95642195f6905c14eb5c58e2df32f9bf4bee10 Mon Sep 17 00:00:00 2001 From: kashike <[email protected]> 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 a655b331..e8762c48 100644 +index bf2916802..61efcc479 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -409,4 +409,9 @@ public class PaperWorldConfig { +@@ -403,4 +403,9 @@ public class PaperWorldConfig { log("Treasure Maps will return already discovered locations"); } } @@ -19,7 +19,7 @@ index a655b331..e8762c48 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index eea9c598..fa251672 100644 +index 7af76e14c..2028cf81e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1331,6 +1331,7 @@ public abstract class World implements IBlockAccess { diff --git a/Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch b/Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch index 04708acea0..377bd7f5df 100644 --- a/Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch +++ b/Spigot-Server-Patches/0188-Add-option-to-remove-invalid-statistics.patch @@ -1,14 +1,14 @@ -From a69f13e71467a2ba1d9762b972c3247cf1010f8f Mon Sep 17 00:00:00 2001 +From 49af7d8211b0653c4c51e0a1bc092a2ea839d99c Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Tue, 20 Dec 2016 23:09:21 -0600 Subject: [PATCH] Add option to remove invalid statistics diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index dcb971a17..7e0f67053 100644 +index 17102d95d..2c3d30364 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -246,4 +246,13 @@ public class PaperConfig { +@@ -255,4 +255,13 @@ public class PaperConfig { private static void playerAutoSaveRate() { playerAutoSaveRate = getInt("settings.player-auto-save-rate", -1); } @@ -53,5 +53,5 @@ index 99466dbde..d1bee0257 100644 } } -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0189-IllegalPacketEvent.patch b/Spigot-Server-Patches/0189-IllegalPacketEvent.patch index c7ced0d0a1..3d5c2fb55b 100644 --- a/Spigot-Server-Patches/0189-IllegalPacketEvent.patch +++ b/Spigot-Server-Patches/0189-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From c4a445c8c548b1cd7ab3534a89ded186de3caa8f Mon Sep 17 00:00:00 2001 +From d6cecfa20754ae57df1245f130abd2ec860667db Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> 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 30726ae69..c6d63011d 100644 +index b7e1d84d4..9214c5594 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; @@ -17,7 +17,7 @@ index 30726ae69..c6d63011d 100644 import co.aikar.timings.MinecraftTimings; // Paper // CraftBukkit end -@@ -2220,8 +2221,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2228,8 +2229,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { CraftEventFactory.handleEditBookEvent(player, itemstack1); // CraftBukkit } } catch (Exception exception) { @@ -27,7 +27,7 @@ index 30726ae69..c6d63011d 100644 } } else { String s1; -@@ -2263,8 +2263,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2271,8 +2271,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { CraftEventFactory.handleEditBookEvent(player, itemstack2); // CraftBukkit } } catch (Exception exception1) { @@ -37,7 +37,7 @@ index 30726ae69..c6d63011d 100644 } } else if ("MC|TrSel".equals(s)) { try { -@@ -2275,8 +2274,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2283,8 +2282,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { ((ContainerMerchant) container).d(j); } } catch (Exception exception2) { @@ -47,7 +47,7 @@ index 30726ae69..c6d63011d 100644 } } else { TileEntity tileentity; -@@ -2417,8 +2415,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2425,8 +2423,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { iinventory.update(); } } catch (Exception exception5) { @@ -57,7 +57,7 @@ index 30726ae69..c6d63011d 100644 } } } else if ("MC|ItemName".equals(s)) { -@@ -2517,7 +2514,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2525,7 +2522,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { this.player.playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, k, this.player.inventory.getItem(k))); this.player.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(this.player.inventory.itemInHandIndex)); } catch (Exception exception7) { @@ -67,5 +67,5 @@ index 30726ae69..c6d63011d 100644 } // CraftBukkit start -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch index 2263e51d74..d25d81208b 100644 --- a/Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0190-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From c84e25b7947738d4989e75b84eaf9618c499ec03 Mon Sep 17 00:00:00 2001 +From 8515465d18c5fc9d4efec8b2f42df99d779e3467 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland <[email protected]> Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug @@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index cff21dd8d..58217e55f 100644 +index a7a71242e..3147f4a08 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1333,7 +1333,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -19,10 +19,10 @@ index cff21dd8d..58217e55f 100644 public void reset() { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index c6d63011d..48fc18f64 100644 +index 9214c5594..964de593b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2542,6 +2542,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2550,6 +2550,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { // CraftBukkit start - Add "isDisconnected" method public final boolean isDisconnected() { @@ -31,5 +31,5 @@ index c6d63011d..48fc18f64 100644 } } -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch b/Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch index 51509f4a85..ce26883133 100644 --- a/Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch +++ b/Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch @@ -1,4 +1,4 @@ -From 1eb8895ea3faa5a5d86cce1a3987dafae44af62a Mon Sep 17 00:00:00 2001 +From 1916b522325da7e8f0b8bd7ef187d273dbf3c3fe Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 2 Jan 2017 02:07:24 -0500 Subject: [PATCH] MC-111699: Ignore Improper Anvil Item Name Packets @@ -11,10 +11,10 @@ This breaks the ability to rename more than 1 item at a time. See: https://bugs.mojang.com/browse/MC-111699 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 48fc18f64..85a397fc0 100644 +index 964de593b..87683b20b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2426,7 +2426,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2434,7 +2434,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { String s4 = SharedConstants.a(packetplayincustompayload.b().e(32767)); if (s4.length() <= 30) { @@ -24,5 +24,5 @@ index 48fc18f64..85a397fc0 100644 } else { containeranvil.a(""); -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch b/Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch index 03362eb85f..727bb3e2af 100644 --- a/Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch +++ b/Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch @@ -1,14 +1,14 @@ -From e567e95f08b62e4dc0745348cd1268b02fe2e6d6 Mon Sep 17 00:00:00 2001 +From 2e1a789f83071834c7d4846a07f04c6fa7610e42 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 2 Jan 2017 02:43:22 -0500 Subject: [PATCH] MC-112017: Allow 31 instead of 30 for item names diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 85a397fc0..be9c4cc7f 100644 +index 87683b20b..e69817d84 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -2425,7 +2425,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -2433,7 +2433,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { if (packetplayincustompayload.b() != null && packetplayincustompayload.b().readableBytes() >= 1) { String s4 = SharedConstants.a(packetplayincustompayload.b().e(32767)); @@ -18,5 +18,5 @@ index 85a397fc0..be9c4cc7f 100644 } } else { -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch index 1d6cd7ab50..d006a3830b 100644 --- a/Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,14 +1,14 @@ -From 6ed7a04198e6377cefc6e90ed0d4fb4f03847539 Mon Sep 17 00:00:00 2001 +From cedb2ab2fe8a4fbaa13b4f1a9384aad56daaa763 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland <[email protected]> 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 4582b44ca..a1d2233ba 100644 +index 1e295432e..6fcced926 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -1869,6 +1869,7 @@ public abstract class Entity implements ICommandListener { +@@ -1917,6 +1917,7 @@ public abstract class Entity implements ICommandListener { } protected void o(Entity entity) { @@ -17,5 +17,5 @@ index 4582b44ca..a1d2233ba 100644 throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)"); } else { -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0203-Fix-block-break-desync.patch b/Spigot-Server-Patches/0203-Fix-block-break-desync.patch index 26ac4808dd..340b92ff80 100644 --- a/Spigot-Server-Patches/0203-Fix-block-break-desync.patch +++ b/Spigot-Server-Patches/0203-Fix-block-break-desync.patch @@ -1,14 +1,14 @@ -From 6dab89610b23619c3ed9526b91839eb7fd19bdf3 Mon Sep 17 00:00:00 2001 +From 58a96ddb1fd5fe1a7658282ea788fc684c88eb44 Mon Sep 17 00:00:00 2001 From: Michael Himing <[email protected]> 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 be9c4cc7f..f153e58ee 100644 +index e69817d84..10c53965c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -821,6 +821,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -829,6 +829,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { double d3 = d0 * d0 + d1 * d1 + d2 * d2; if (d3 > 36.0D) { @@ -17,5 +17,5 @@ index be9c4cc7f..f153e58ee 100644 } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) { return; -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch index 785792bf10..f0f03a8d99 100644 --- a/Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From da9c2df1370a98d01f434079113c709ac652bdb6 Mon Sep 17 00:00:00 2001 +From 23c17eaec5bdb4e6917aed2c4c4f39b603a07d5c Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -12,10 +12,10 @@ 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 e8762c487..dba1c477e 100644 +index 61efcc479..4898e8bce 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -414,4 +414,10 @@ public class PaperWorldConfig { +@@ -408,4 +408,10 @@ public class PaperWorldConfig { private void armorStandEntityLookups() { armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true); } @@ -27,7 +27,7 @@ index e8762c487..dba1c477e 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a1d2233ba..37dc29f63 100644 +index 6fcced926..cfeff7c48 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -168,6 +168,7 @@ public abstract class Entity implements ICommandListener { @@ -39,7 +39,7 @@ index a1d2233ba..37dc29f63 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 07688b1ce..6ac6a4062 100644 +index 7242da9cc..53486e205 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2132,8 +2132,11 @@ public abstract class EntityLiving extends Entity { @@ -56,5 +56,5 @@ index 07688b1ce..6ac6a4062 100644 this.C(entity); } -- -2.11.0 +2.12.0.windows.1 diff --git a/Spigot-Server-Patches/0213-Do-not-allow-portals-to-move-dead-entities-across-wo.patch b/Spigot-Server-Patches/0213-Do-not-allow-portals-to-move-dead-entities-across-wo.patch deleted file mode 100644 index 4db71dd305..0000000000 --- a/Spigot-Server-Patches/0213-Do-not-allow-portals-to-move-dead-entities-across-wo.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 9b910d46c99320223dfa35efe4f3453bfa008313 Mon Sep 17 00:00:00 2001 -From: Shane Freeder <[email protected]> -Date: Fri, 17 Mar 2017 01:45:15 +0000 -Subject: [PATCH] Do not allow portals to move dead entities across worlds - - -diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0e1d9817..38532977 100644 ---- a/src/main/java/net/minecraft/server/Entity.java -+++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2325,7 +2325,7 @@ public abstract class Entity implements ICommandListener { - // CraftBukkit end */ - - this.world.kill(this); -- this.dead = false; -+ //this.dead = false; // Paper - Mark entity as dead before we actually move it to the new world - this.world.methodProfiler.a("reposition"); - /* CraftBukkit start - Handled in calculateTarget - BlockPosition blockposition; -@@ -2376,7 +2376,20 @@ public abstract class Entity implements ICommandListener { - entity.setPositionRotation(blockposition, entity.yaw, entity.pitch); - } - // CraftBukkit end */ -- -+ // Paper Start - relocate code to modify the entities exit in a portal -+ if (portal) { -+ org.bukkit.util.Vector velocity = entity.getBukkitEntity().getVelocity(); -+ worldserver1.getTravelAgent().adjustExit(entity, exit, velocity); -+ entity.setPositionRotation(exit.getX(), exit.getY(), exit.getZ(), exit.getYaw(), exit.getPitch()); -+ if (entity.motX != velocity.getX() || entity.motY != velocity.getY() || entity.motZ != velocity.getZ()) { -+ //entity.getBukkitEntity().setVelocity(velocity); // We don't have a CraftEntity yet, set these manually... -+ entity.motX = velocity.getX(); -+ entity.motY = velocity.getY(); -+ entity.motZ = velocity.getZ(); -+ entity.velocityChanged = true; -+ } -+ } -+ // Paper end - boolean flag = entity.attachedToPlayer; - - entity.attachedToPlayer = true; -diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index a9d59bbf..2d8717f4 100644 ---- a/src/main/java/net/minecraft/server/PlayerList.java -+++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -987,7 +987,7 @@ public abstract class PlayerList { - worldserver.methodProfiler.b(); - } - -- entity.spawnIn(worldserver1); -+ if (!entity.dead) entity.spawnIn(worldserver1); // Paper - Do not move dead entities - // CraftBukkit end - } - --- -2.12.0 - diff --git a/work/Bukkit b/work/Bukkit -Subproject baf4ff4d9774fbde0f7dae677d81c76b0c452eb +Subproject 7fd370c8c087679c0324e2acf91efa8751df027 diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject dfee3d9f9f3b8ea63c21a5c8858f78aa89d3b24 +Subproject d09304e5db889f233abc5e57416119d131af083 diff --git a/work/Spigot b/work/Spigot -Subproject 96235abb3d06748ce050436c0109346fef7348a +Subproject 625bc007002982e7c07a9d184fcdb1b6e13162b |