From 99e3002266622f158707632d6734156fdc414c8a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 30 Nov 2014 16:21:39 -0600 Subject: [PATCH] Regen our patches --- .../0004-Player-affects-spawning-API.patch | 6 +++--- Spigot-API-Patches/0005-Add-getTPS-method.patch | 6 +++--- .../0006-Invisible-players-don-t-have-rights.patch | 6 +++--- .../0018-Player-Exhaustion-Multipliers.patch | 6 +++--- .../0023-Center-TNT-grid-sample-points.patch | 8 ++++---- .../0024-Player-affects-spawning-API.patch | 12 ++++++------ ...rSpigot-in-client-crashes-server-lists-and-.patch | 6 +++--- ...ecific-entities-that-fly-through-an-unloade.patch | 8 ++++---- .../0033-Further-improve-server-tick-loop.patch | 12 ++++++------ .../0035-Only-refresh-abilities-if-needed.patch | 6 +++--- .../0037-Improve-autosave-mechanism.patch | 8 ++++---- 11 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch index 65e2bcba21..5e1eaad79e 100644 --- a/Spigot-API-Patches/0004-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0004-Player-affects-spawning-API.patch @@ -1,14 +1,14 @@ -From 782378e964c0df175a8bb46055b1d0e63fbf3dfb Mon Sep 17 00:00:00 2001 +From acaa1434ed190e4fcf4773a8f5d9e53d2afbab4e Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 8 Aug 2014 22:51:26 -0500 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b2ad5b7..b2a8e2e 100644 +index b55d70e..9793aae 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1102,6 +1102,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline +@@ -1104,6 +1104,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Spigot-API-Patches/0005-Add-getTPS-method.patch b/Spigot-API-Patches/0005-Add-getTPS-method.patch index 9384b8f93e..1785c9b61e 100644 --- a/Spigot-API-Patches/0005-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0005-Add-getTPS-method.patch @@ -1,14 +1,14 @@ -From eae88541a7dfe4f66682ac973b0e301916a26739 Mon Sep 17 00:00:00 2001 +From e72ca8f6069f746db006415563451d9f23f2f5fd Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 19 Oct 2014 18:22:18 -0500 Subject: [PATCH] Add getTPS method diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index f861214..8d3865b 100644 +index 57b2794..fff2843 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -915,6 +915,13 @@ public interface Server extends PluginMessageRecipient { +@@ -916,6 +916,13 @@ public interface Server extends PluginMessageRecipient { { throw new UnsupportedOperationException( "Not supported yet." ); } diff --git a/Spigot-Server-Patches/0006-Invisible-players-don-t-have-rights.patch b/Spigot-Server-Patches/0006-Invisible-players-don-t-have-rights.patch index e6aa79b7cb..27e1f1dfd2 100644 --- a/Spigot-Server-Patches/0006-Invisible-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0006-Invisible-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From 7779f2d84472ab241901b62d6785f79b32f8bd5d Mon Sep 17 00:00:00 2001 +From 098854a34a9672de8cb33272a407aaca282940f9 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 28 Nov 2014 00:35:56 -0600 Subject: [PATCH] Invisible players don't have rights @@ -43,10 +43,10 @@ index ce3e628..7fc9abe 100644 if (movingobjectposition.type == EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) { this.aq(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f128789..6788047 100644 +index 344642c..dd3acde 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1655,6 +1655,14 @@ public abstract class World implements IBlockAccess { +@@ -1654,6 +1654,14 @@ public abstract class World implements IBlockAccess { for (int i = 0; i < list.size(); ++i) { Entity entity1 = (Entity) list.get(i); diff --git a/Spigot-Server-Patches/0018-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0018-Player-Exhaustion-Multipliers.patch index 49d6448e1f..92c171573c 100644 --- a/Spigot-Server-Patches/0018-Player-Exhaustion-Multipliers.patch +++ b/Spigot-Server-Patches/0018-Player-Exhaustion-Multipliers.patch @@ -1,4 +1,4 @@ -From 4f2a2610b45a7c09d12fbf3e04c60f6eba005773 Mon Sep 17 00:00:00 2001 +From 97c609c1e405273512d989e825cbc91a1157601a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 28 Nov 2014 01:41:54 -0600 Subject: [PATCH] Player Exhaustion Multipliers @@ -18,10 +18,10 @@ index 9a19752..32d678d 100644 ItemStack itemstack = this.i(iblockdata); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index b382854..5d03955 100644 +index 20662f8..3e5e121 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1351,13 +1351,13 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1352,13 +1352,13 @@ public abstract class EntityHuman extends EntityLiving { i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F); if (i > 0) { this.a(StatisticList.p, i); diff --git a/Spigot-Server-Patches/0023-Center-TNT-grid-sample-points.patch b/Spigot-Server-Patches/0023-Center-TNT-grid-sample-points.patch index 7bed12e8b3..9d421dc6a8 100644 --- a/Spigot-Server-Patches/0023-Center-TNT-grid-sample-points.patch +++ b/Spigot-Server-Patches/0023-Center-TNT-grid-sample-points.patch @@ -1,14 +1,14 @@ -From fdcaa4e3ccf4baac17b16f9d7121f3794afc15a0 Mon Sep 17 00:00:00 2001 +From 5a51e51a849a44eeb57a149ca5aa2c8bdd59c3cb Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 28 Nov 2014 02:36:18 -0600 Subject: [PATCH] Center TNT grid sample points diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index df976aa..6528b89 100644 +index 4540baa..4af7973 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1861,6 +1861,12 @@ public abstract class World implements IBlockAccess { +@@ -1860,6 +1860,12 @@ public abstract class World implements IBlockAccess { double d1 = 1.0D / ((axisalignedbb.e - axisalignedbb.b) * 2.0D + 1.0D); double d2 = 1.0D / ((axisalignedbb.f - axisalignedbb.c) * 2.0D + 1.0D); @@ -21,7 +21,7 @@ index df976aa..6528b89 100644 if (d0 >= 0.0D && d1 >= 0.0D && d2 >= 0.0D) { int i = 0; int j = 0; -@@ -1872,7 +1878,7 @@ public abstract class World implements IBlockAccess { +@@ -1871,7 +1877,7 @@ public abstract class World implements IBlockAccess { double d4 = axisalignedbb.b + (axisalignedbb.e - axisalignedbb.b) * (double) f1; double d5 = axisalignedbb.c + (axisalignedbb.f - axisalignedbb.c) * (double) f2; diff --git a/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch index d41903cd6b..03460f88d2 100644 --- a/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch @@ -1,11 +1,11 @@ -From 68be838276d9de5156026f7fe214f3bb0265ccb1 Mon Sep 17 00:00:00 2001 +From f858e434f3cc3db73f8279111267edc4a758c44f Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 28 Nov 2014 03:31:21 -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 5d03955..847b507 100644 +index 3e5e121..76ec805 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -59,6 +59,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -67,7 +67,7 @@ index 43954b3..932a572 100644 biomemeta = worldserver.a(enumcreaturetype, blockposition2); if (biomemeta == null) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6528b89..5a2634a 100644 +index 4af7973..899e4b8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2,14 +2,13 @@ package net.minecraft.server; @@ -94,7 +94,7 @@ index 6528b89..5a2634a 100644 import org.bukkit.craftbukkit.SpigotTimings; // Spigot import org.bukkit.generator.ChunkGenerator; import org.bukkit.craftbukkit.CraftServer; -@@ -2768,6 +2766,50 @@ public abstract class World implements IBlockAccess { +@@ -2767,6 +2765,50 @@ public abstract class World implements IBlockAccess { return false; } @@ -146,10 +146,10 @@ index 6528b89..5a2634a 100644 for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman = (EntityHuman) this.players.get(i); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d006fb6..78c376d 100644 +index 36aeed0..ab8afd7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1457,6 +1457,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return java.util.Collections.unmodifiableSet( ret ); } diff --git a/Spigot-Server-Patches/0025-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch b/Spigot-Server-Patches/0025-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch index da33bc9e05..d4b83fcb02 100644 --- a/Spigot-Server-Patches/0025-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch +++ b/Spigot-Server-Patches/0025-Show-PaperSpigot-in-client-crashes-server-lists-and-.patch @@ -1,4 +1,4 @@ -From 98926d247f3502b910455c452053dba93f6329ea Mon Sep 17 00:00:00 2001 +From f80b11f9bd044053f769a6091f5ed452f183586d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 19 Aug 2014 14:21:37 -0500 Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and @@ -6,10 +6,10 @@ Subject: [PATCH] Show 'PaperSpigot' in client crashes, server lists, and diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c85418c..f47ea18 100644 +index 0c02747..246d042 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1046,7 +1046,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -1048,7 +1048,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs } public String getServerModName() { diff --git a/Spigot-Server-Patches/0030-Remove-specific-entities-that-fly-through-an-unloade.patch b/Spigot-Server-Patches/0030-Remove-specific-entities-that-fly-through-an-unloade.patch index ef59d0dcc8..cb91704a07 100644 --- a/Spigot-Server-Patches/0030-Remove-specific-entities-that-fly-through-an-unloade.patch +++ b/Spigot-Server-Patches/0030-Remove-specific-entities-that-fly-through-an-unloade.patch @@ -1,4 +1,4 @@ -From 8a2a12231d353beb66545da4fd35bcb90a3a6173 Mon Sep 17 00:00:00 2001 +From 98ec341d07427cb8f14ffcd7c7781f8d274c1fca Mon Sep 17 00:00:00 2001 From: Iceee Date: Fri, 28 Nov 2014 12:11:03 -0600 Subject: [PATCH] Remove specific entities that fly through an unloaded chunk @@ -70,10 +70,10 @@ index 4823698..7b856ef 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bdb4a1b..d860a1b 100644 +index 351c88b..4e8a3ca 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1152,6 +1152,7 @@ public abstract class World implements IBlockAccess { +@@ -1151,6 +1151,7 @@ public abstract class World implements IBlockAccess { { if ( !this.isChunkLoaded( chunkx, chunkz, true ) ) { @@ -81,7 +81,7 @@ index bdb4a1b..d860a1b 100644 continue; } int cz = chunkz << 4; -@@ -1569,6 +1570,14 @@ public abstract class World implements IBlockAccess { +@@ -1568,6 +1569,14 @@ public abstract class World implements IBlockAccess { if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { entity.ticksLived++; entity.inactiveTick(); diff --git a/Spigot-Server-Patches/0033-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0033-Further-improve-server-tick-loop.patch index 19b9191dd3..06451e7cab 100644 --- a/Spigot-Server-Patches/0033-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0033-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From c1fd3c7f88ca3987c954a398127e0f81bc035457 Mon Sep 17 00:00:00 2001 +From dfa34ba2aaf9c53152a181b2829f4c793c09b025 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 28 Nov 2014 12:48:26 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f47ea18..89c6c2c 100644 +index 246d042..21df638 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -113,17 +113,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -34,7 +34,7 @@ index f47ea18..89c6c2c 100644 public MinecraftServer(OptionSet options, Proxy proxy, File file1) { io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable -@@ -484,12 +478,53 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -486,12 +480,53 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs this.isRunning = false; } @@ -93,7 +93,7 @@ index f47ea18..89c6c2c 100644 public void run() { try { -@@ -502,26 +537,43 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -504,26 +539,43 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs this.a(this.r); // Spigot start @@ -150,10 +150,10 @@ index f47ea18..89c6c2c 100644 lastTick = curTime; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e5426b3..1ecd9d0 100644 +index 1693627..160d665 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1685,6 +1685,17 @@ public final class CraftServer implements Server { +@@ -1686,6 +1686,17 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() { diff --git a/Spigot-Server-Patches/0035-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0035-Only-refresh-abilities-if-needed.patch index 9482f51c51..d705c92ce8 100644 --- a/Spigot-Server-Patches/0035-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0035-Only-refresh-abilities-if-needed.patch @@ -1,14 +1,14 @@ -From 07feba646b55b7fd060fb91bdcc66c2d7f8b3baa Mon Sep 17 00:00:00 2001 +From ca69d5f4566892c66abcf55ad2a01295ab897312 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Nov 2014 13:20:22 -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 914187d..6da3b32 100644 +index ab8afd7..a2cda7e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1174,12 +1174,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1175,12 +1175,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setFlying(boolean value) { diff --git a/Spigot-Server-Patches/0037-Improve-autosave-mechanism.patch b/Spigot-Server-Patches/0037-Improve-autosave-mechanism.patch index 7547bfdb80..ca250414e4 100644 --- a/Spigot-Server-Patches/0037-Improve-autosave-mechanism.patch +++ b/Spigot-Server-Patches/0037-Improve-autosave-mechanism.patch @@ -1,4 +1,4 @@ -From 1a5cc6ba71f20ad4cf2b739013481cf1ece63736 Mon Sep 17 00:00:00 2001 +From 9307372b2c5d53c55cc41b0ecd4397f381a1c802 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Nov 2014 13:47:24 -0600 Subject: [PATCH] Improve autosave mechanism @@ -6,7 +6,7 @@ Subject: [PATCH] Improve autosave mechanism Only save modified chunks, or chunks with entities after 4 auto save passes diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 538ae9c..b840ca7 100644 +index 949fa96..881e963 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -927,7 +927,7 @@ public class Chunk { @@ -19,10 +19,10 @@ index 538ae9c..b840ca7 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 189fe12..d585369 100644 +index 21df638..f51a50d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -696,9 +696,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs +@@ -698,9 +698,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs // Spigot Start // We replace this with saving each individual world as this.saveChunks(...) is broken, // and causes the main thread to sleep for random amounts of time depending on chunk activity