From 687a0190ef59611cca4cba981e17b4881c51df17 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 25 Jun 2016 11:52:46 +1000 Subject: [PATCH] Update to Minecraft 1.10.2 --- Bukkit-Patches/0001-POM-Changes.patch | 6 +++--- CraftBukkit-Patches/0001-POM-Changes.patch | 6 +++--- .../0008-Async-Operation-Catching.patch | 6 +++--- CraftBukkit-Patches/0010-Spigot-Timings.patch | 14 +++++++------- .../0014-Entity-Activation-Range.patch | 8 ++++---- .../0028-Configurable-Messages.patch | 12 ++++++------ .../0065-Highly-Optimized-Tick-Loop.patch | 6 +++--- .../0122-Fix-Null-Tile-Entity-Worlds.patch | 6 +++--- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch index 6aa3d36a..2c8b3b57 100644 --- a/Bukkit-Patches/0001-POM-Changes.patch +++ b/Bukkit-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From f156cef24bc16b083c596ad3235c1039b2520248 Mon Sep 17 00:00:00 2001 +From 7806e36e80a5d673895f9c7c0b230ebf42e7b7d8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 10:36:24 +1000 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 7215bd1..b11ec5e 100644 +index 653b01f..aa9c259 100644 --- a/pom.xml +++ b/pom.xml @@ -9,14 +9,14 @@ @@ -16,7 +16,7 @@ index 7215bd1..b11ec5e 100644 - bukkit + org.spigotmc + spigot-api - 1.10-R0.1-SNAPSHOT + 1.10.2-R0.1-SNAPSHOT jar - Bukkit diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch index 0c952c6d..cd2d99f1 100644 --- a/CraftBukkit-Patches/0001-POM-Changes.patch +++ b/CraftBukkit-Patches/0001-POM-Changes.patch @@ -1,4 +1,4 @@ -From a1017aa9a490b184dd557349ce6554608dee00cf Mon Sep 17 00:00:00 2001 +From e58c97889574e8999dc42b17b1e740868b9a9680 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 13:07:39 +1000 Subject: [PATCH] POM Changes @@ -6,7 +6,7 @@ Subject: [PATCH] POM Changes Basic changes to the build system which mark the artifact as Spigot, and the necessary code changes to ensure proper functionality. Also disables the auto updater provided by CraftBukkit as it is useless to us. diff --git a/pom.xml b/pom.xml -index f0f21ec..9fa8bde 100644 +index 22e6775..2619fee 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -18,7 +18,7 @@ index f0f21ec..9fa8bde 100644 + org.spigotmc + spigot jar - 1.10-R0.1-SNAPSHOT + 1.10.2-R0.1-SNAPSHOT - CraftBukkit - http://www.bukkit.org + Spigot diff --git a/CraftBukkit-Patches/0008-Async-Operation-Catching.patch b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch index de67e9cb..293a5dce 100644 --- a/CraftBukkit-Patches/0008-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From 42a71f88111570d72dc962044a8c98afc9b08a03 Mon Sep 17 00:00:00 2001 +From ba9bfaa7f4c131cb522a15c7991071e92be4177e Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching @@ -78,7 +78,7 @@ index 06626b4..af32116 100644 this.trackedPlayers.remove(entityplayer); this.tracker.c(entityplayer); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index d29cd04..efe4d18 100644 +index 0c9f587..778b1c6 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -910,6 +910,7 @@ public abstract class World implements IBlockAccess { @@ -97,7 +97,7 @@ index d29cd04..efe4d18 100644 entity.b(false); entity.die(); if (entity instanceof EntityHuman) { -@@ -2467,6 +2469,7 @@ public abstract class World implements IBlockAccess { +@@ -2474,6 +2476,7 @@ public abstract class World implements IBlockAccess { } public void a(Collection collection) { diff --git a/CraftBukkit-Patches/0010-Spigot-Timings.patch b/CraftBukkit-Patches/0010-Spigot-Timings.patch index 36644865..44d342fe 100644 --- a/CraftBukkit-Patches/0010-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0010-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 614dae9d6eda3b659ecfeff1fadda63451bfb522 Mon Sep 17 00:00:00 2001 +From 544cf1c81c690e8a8ee1d1814faafdb5c567e111 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -46,7 +46,7 @@ index 1703382..2a604c6 100644 return chunk; diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 362d2b7..06f0768 100644 +index 5c333de..3de34be 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -46,7 +46,9 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -96,7 +96,7 @@ index 362d2b7..06f0768 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 205f943..2211d45 100644 +index 99aa2b0..b0c4bf6 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -22,6 +22,7 @@ import java.io.PrintStream; @@ -230,7 +230,7 @@ index 5b966f7..0e5f08f 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 046d47c..7014450 100644 +index 715ada4..f738015 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -50,6 +50,8 @@ import org.apache.logging.log4j.Logger; @@ -408,7 +408,7 @@ index 37eb0ce..d1809e7 100644 private static final Map> f = Maps.newHashMap(); private static final Map, String> g = Maps.newHashMap(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index efe4d18..b2f8c05 100644 +index 778b1c6..c197b65 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,6 +18,7 @@ import com.google.common.collect.Maps; @@ -502,7 +502,7 @@ index efe4d18..b2f8c05 100644 this.methodProfiler.b(); this.methodProfiler.b(); } -@@ -1508,6 +1526,7 @@ public abstract class World implements IBlockAccess { +@@ -1515,6 +1533,7 @@ public abstract class World implements IBlockAccess { // CraftBukkit start - Use neighbor cache instead of looking up Chunk startingChunk = this.getChunkIfLoaded(i >> 4, j >> 4); if (!flag || (startingChunk != null && startingChunk.areNeighborsLoaded(2)) /* this.isAreaLoaded(i - b0, 0, j - b0, i + b0, 0, j + b0) */) { @@ -510,7 +510,7 @@ index efe4d18..b2f8c05 100644 // CraftBukkit end entity.M = entity.locX; entity.N = entity.locY; -@@ -1575,6 +1594,7 @@ public abstract class World implements IBlockAccess { +@@ -1582,6 +1601,7 @@ public abstract class World implements IBlockAccess { } } diff --git a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch index e10e8e16..0ae3b42c 100644 --- a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From e7c507ede0e37e23014da591713bb4b9afb0cab2 Mon Sep 17 00:00:00 2001 +From c6f56f3fbc7da51f0f0c1ba98599bc1a8eebf9bc Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7338524..f860c1e 100644 +index 7114925..11f73e1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -107,7 +107,7 @@ public abstract class Entity implements ICommandListener { @@ -186,7 +186,7 @@ index 0e5f08f..05a7c9a 100644 public void Q() { this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 332683a..2996274 100644 +index a5b5e8e..1c56a2b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1346,6 +1346,7 @@ public abstract class World implements IBlockAccess { @@ -197,7 +197,7 @@ index 332683a..2996274 100644 timings.entityTick.startTiming(); // Spigot // CraftBukkit start - Use field for loop variable for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) { -@@ -1530,9 +1531,11 @@ public abstract class World implements IBlockAccess { +@@ -1537,9 +1538,11 @@ public abstract class World implements IBlockAccess { int j = MathHelper.floor(entity.locZ); boolean flag1 = true; diff --git a/CraftBukkit-Patches/0028-Configurable-Messages.patch b/CraftBukkit-Patches/0028-Configurable-Messages.patch index b62647c9..6fc1b6d7 100644 --- a/CraftBukkit-Patches/0028-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0028-Configurable-Messages.patch @@ -1,24 +1,24 @@ -From edecd1c57d89ae665dbb7236c42b7b1b7e859f7e Mon Sep 17 00:00:00 2001 +From bb0543fd9dfb814c0b3dd9d3c9fb00d30229db5e Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 21 Jun 2013 19:21:58 +1000 Subject: [PATCH] Configurable Messages diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 31cdef8..2646ccd 100644 +index 77bba1f..3859e41 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -62,11 +62,11 @@ public class HandshakeListener implements PacketHandshakingInListener { // CraftBukkit end if (packethandshakinginsetprotocol.b() > 210) { -- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.10"); -+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage.replaceAll("'", "''"), "1.10" ) ); // Spigot +- chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.10.2"); ++ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage.replaceAll("'", "''"), "1.10.2" ) ); // Spigot this.b.sendPacket(new PacketLoginOutDisconnect(chatcomponenttext)); this.b.close(chatcomponenttext); } else if (packethandshakinginsetprotocol.b() < 210) { -- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.10"); -+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage.replaceAll("'", "''"), "1.10" ) ); // Spigot +- chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.10.2"); ++ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage.replaceAll("'", "''"), "1.10.2" ) ); // Spigot this.b.sendPacket(new PacketLoginOutDisconnect(chatcomponenttext)); this.b.close(chatcomponenttext); } else { diff --git a/CraftBukkit-Patches/0065-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0065-Highly-Optimized-Tick-Loop.patch index 4a9faee7..da9d7d66 100644 --- a/CraftBukkit-Patches/0065-Highly-Optimized-Tick-Loop.patch +++ b/CraftBukkit-Patches/0065-Highly-Optimized-Tick-Loop.patch @@ -1,11 +1,11 @@ -From b895bb3dd01695b6755297b4c12068d219209dfe Mon Sep 17 00:00:00 2001 +From 6dc70b32ffdf8a0b745fe744fe4c4b45df243dde Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 25 Jan 2014 14:08:35 +1100 Subject: [PATCH] Highly Optimized Tick Loop diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 954d9bf..a21fc76 100644 +index b4b7c62..8bfb5c7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -119,6 +119,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -36,7 +36,7 @@ index 954d9bf..a21fc76 100644 try { if (this.init()) { @@ -524,38 +537,34 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs - this.q.setServerInfo(new ServerPing.ServerData("1.10", 210)); + this.q.setServerInfo(new ServerPing.ServerData("1.10.2", 210)); this.a(this.q); + // Spigot start diff --git a/CraftBukkit-Patches/0122-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0122-Fix-Null-Tile-Entity-Worlds.patch index 50e6b016..7e2224b7 100644 --- a/CraftBukkit-Patches/0122-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0122-Fix-Null-Tile-Entity-Worlds.patch @@ -1,14 +1,14 @@ -From 9e202ca61267793656ce37d73f23716b98040ccf Mon Sep 17 00:00:00 2001 +From b2d8a8060541d63d6558b5af3b79d054484e5347 Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Thu, 26 Jun 2014 18:37:29 -0400 Subject: [PATCH] Fix Null Tile Entity Worlds diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3f004a2..edcc02c 100644 +index 0c9031a..39740e0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1981,6 +1981,7 @@ public abstract class World implements IBlockAccess { +@@ -1988,6 +1988,7 @@ public abstract class World implements IBlockAccess { } }