diff --git a/patches/server/0020-Colour-Console-Messages.patch b/patches/server/0020-Colour-Console-Messages.patch deleted file mode 100644 index 8aca868c8..000000000 --- a/patches/server/0020-Colour-Console-Messages.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cea884b5da524d5e238f5d89f69fafa66286f415 Mon Sep 17 00:00:00 2001 -From: cswhite2000 <18whitechristop@gmail.com> -Date: Sat, 4 Aug 2018 21:33:00 -0700 -Subject: [PATCH] Colour Console Messages - - -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bbca20fa0..b10845cd8 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1170,7 +1170,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs - } - - public void sendMessage(IChatBaseComponent ichatbasecomponent) { -- MinecraftServer.LOGGER.info(ichatbasecomponent.c()); -+ this.console.sendMessage(ichatbasecomponent.c()); // CraftBukkit - we want coloured and pretty messages too! - } - - public boolean a(int i, String s) { --- -2.18.0 - diff --git a/patches/server/0021-Make-scoreboard-classes-public.patch b/patches/server/0020-Make-scoreboard-classes-public.patch similarity index 94% rename from patches/server/0021-Make-scoreboard-classes-public.patch rename to patches/server/0020-Make-scoreboard-classes-public.patch index 2d8c1547b..c1a433005 100644 --- a/patches/server/0021-Make-scoreboard-classes-public.patch +++ b/patches/server/0020-Make-scoreboard-classes-public.patch @@ -1,11 +1,11 @@ -From 03167cfb95e34b48a6f3efb70734c7bba4b085a7 Mon Sep 17 00:00:00 2001 +From 57cead3697a5985aeb24299ad9284d492d908f01 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 4 Aug 2018 21:54:22 -0700 Subject: [PATCH] Make scoreboard classes public diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java -index 7dedd0222..5a7c60c2d 100644 +index 7dedd022..5a7c60c2 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftCriteria.java @@ -7,7 +7,7 @@ import net.minecraft.server.ScoreboardObjective; @@ -18,7 +18,7 @@ index 7dedd0222..5a7c60c2d 100644 static final CraftCriteria DUMMY; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java -index 5bd8cf9d7..18f515b8e 100644 +index 5bd8cf9d..18f515b8 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftObjective.java @@ -9,7 +9,7 @@ import org.bukkit.scoreboard.DisplaySlot; @@ -40,7 +40,7 @@ index 5bd8cf9d7..18f515b8e 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java -index ee9d2aedd..b10201d83 100644 +index ee9d2aed..b10201d8 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java @@ -17,7 +17,7 @@ import org.bukkit.scoreboard.Score; @@ -53,7 +53,7 @@ index ee9d2aedd..b10201d83 100644 private final CraftObjective objective; diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardComponent.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardComponent.java -index d26d09d41..43b72ecf6 100644 +index d26d09d4..43b72ecf 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardComponent.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardComponent.java @@ -1,6 +1,6 @@ @@ -65,7 +65,7 @@ index d26d09d41..43b72ecf6 100644 CraftScoreboardComponent(CraftScoreboard scoreboard) { diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java -index d08e5a281..4a305bb16 100644 +index d08e5a28..4a305bb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java @@ -6,7 +6,7 @@ import org.bukkit.scoreboard.DisplaySlot; @@ -78,7 +78,7 @@ index d08e5a281..4a305bb16 100644 static ImmutableBiMap SLOTS = ImmutableBiMap.of( DisplaySlot.BELOW_NAME, "belowName", diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java -index f5ff0f712..54e9ea1dc 100644 +index f5ff0f71..54e9ea1d 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java @@ -13,7 +13,7 @@ import com.google.common.collect.ImmutableSet; @@ -91,5 +91,5 @@ index f5ff0f712..54e9ea1dc 100644 CraftTeam(CraftScoreboard scoreboard, ScoreboardTeam team) { -- -2.18.0 +2.51.0 diff --git a/patches/server/0022-Add-EntityDespawnInVoidEvent.patch b/patches/server/0021-Add-EntityDespawnInVoidEvent.patch similarity index 91% rename from patches/server/0022-Add-EntityDespawnInVoidEvent.patch rename to patches/server/0021-Add-EntityDespawnInVoidEvent.patch index 836f5079d..5f8e584ff 100644 --- a/patches/server/0022-Add-EntityDespawnInVoidEvent.patch +++ b/patches/server/0021-Add-EntityDespawnInVoidEvent.patch @@ -1,11 +1,11 @@ -From 36eecfe0559faa1da6c66d190d9fc859d8d49335 Mon Sep 17 00:00:00 2001 +From 35951e9a61c5db2d390e53c93cadebb720d053b2 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 4 Aug 2018 22:00:27 -0700 Subject: [PATCH] Add EntityDespawnInVoidEvent diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2da303fee..9746cafda 100644 +index 2da303fe..9746cafd 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -19,6 +19,7 @@ import org.bukkit.entity.Vehicle; @@ -27,5 +27,5 @@ index 2da303fee..9746cafda 100644 } -- -2.18.0 +2.51.0 diff --git a/patches/server/0023-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch b/patches/server/0022-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch similarity index 94% rename from patches/server/0023-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch rename to patches/server/0022-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch index f56b29c5a..7739e36fa 100644 --- a/patches/server/0023-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch +++ b/patches/server/0022-Fix-BlockFromToEvents-firing-when-flow-is-obstructed.patch @@ -1,11 +1,11 @@ -From 2ed6b3bf21f58696a111669396fbe05223049e6b Mon Sep 17 00:00:00 2001 +From b867039ab8e0a5d113e555924e698218a5aabf9a Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 02:08:01 -0700 Subject: [PATCH] Fix BlockFromToEvents firing when flow is obstructed diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index 23130ba96..b1168dfef 100644 +index 23130ba9..b1168dfe 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -143,13 +143,15 @@ public class BlockFlowing extends BlockFluids { @@ -31,5 +31,5 @@ index 23130ba96..b1168dfef 100644 // CraftBukkit end } -- -2.18.0 +2.51.0 diff --git a/patches/server/0024-Fix-wrong-potion-particles-after-respawn.patch b/patches/server/0023-Fix-wrong-potion-particles-after-respawn.patch similarity index 91% rename from patches/server/0024-Fix-wrong-potion-particles-after-respawn.patch rename to patches/server/0023-Fix-wrong-potion-particles-after-respawn.patch index 908523f8d..827cd94e4 100644 --- a/patches/server/0024-Fix-wrong-potion-particles-after-respawn.patch +++ b/patches/server/0023-Fix-wrong-potion-particles-after-respawn.patch @@ -1,11 +1,11 @@ -From 5111fcbed25e914f450e2735a289ba36255c9123 Mon Sep 17 00:00:00 2001 +From 0aad2988f95b58290a4599a3c3ff2888715c0efb Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 02:14:51 -0700 Subject: [PATCH] Fix wrong potion particles after respawn diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 593a12dca..35ba2e718 100644 +index 593a12dc..35ba2e71 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1201,6 +1201,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -25,5 +25,5 @@ index 593a12dca..35ba2e718 100644 this.killer = null; this.lastDamager = null; -- -2.18.0 +2.51.0 diff --git a/patches/server/0025-Add-API-to-disable-potion-particles.patch b/patches/server/0024-Add-API-to-disable-potion-particles.patch similarity index 95% rename from patches/server/0025-Add-API-to-disable-potion-particles.patch rename to patches/server/0024-Add-API-to-disable-potion-particles.patch index f284dac4a..ac29165c9 100644 --- a/patches/server/0025-Add-API-to-disable-potion-particles.patch +++ b/patches/server/0024-Add-API-to-disable-potion-particles.patch @@ -1,11 +1,11 @@ -From e69c1b27aa8b1c29092a70cfdb5938446e989644 Mon Sep 17 00:00:00 2001 +From 2db6f7346565723234661ddb214ec1658a7d60cf Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 02:19:32 -0700 Subject: [PATCH] Add API to disable potion particles diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index c8b4e2928..1c3677a46 100644 +index c8b4e292..1c3677a4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -14,6 +14,7 @@ import java.util.UUID; @@ -37,7 +37,7 @@ index c8b4e2928..1c3677a46 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 0b033fd12..5f544d82f 100644 +index 0b033fd1..5f544d82 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -65,6 +65,7 @@ import org.bukkit.util.Vector; @@ -71,5 +71,5 @@ index 0b033fd12..5f544d82f 100644 return launchProjectile(projectile, null); } -- -2.18.0 +2.51.0 diff --git a/patches/server/0026-Fix-spurious-bucket-empty-events.patch b/patches/server/0025-Fix-spurious-bucket-empty-events.patch similarity index 97% rename from patches/server/0026-Fix-spurious-bucket-empty-events.patch rename to patches/server/0025-Fix-spurious-bucket-empty-events.patch index 486e399de..7c0931f66 100644 --- a/patches/server/0026-Fix-spurious-bucket-empty-events.patch +++ b/patches/server/0025-Fix-spurious-bucket-empty-events.patch @@ -1,11 +1,11 @@ -From d832fa0dd561f7f8ca88abf21e9974d3deb00dc8 Mon Sep 17 00:00:00 2001 +From 7abcefd5a672822c2059accbda72302a9f188386 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 14:58:17 -0700 Subject: [PATCH] Fix spurious bucket empty events diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java -index b62ea42fc..f3bdce536 100644 +index b62ea42f..f3bdce53 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -86,29 +86,33 @@ public class ItemBucket extends Item { @@ -62,5 +62,5 @@ index b62ea42fc..f3bdce536 100644 } -- -2.18.0 +2.51.0 diff --git a/patches/server/0027-Fix-head-rotation-packet-spam.patch b/patches/server/0026-Fix-head-rotation-packet-spam.patch similarity index 91% rename from patches/server/0027-Fix-head-rotation-packet-spam.patch rename to patches/server/0026-Fix-head-rotation-packet-spam.patch index 6d63c89f3..2984adc8b 100644 --- a/patches/server/0027-Fix-head-rotation-packet-spam.patch +++ b/patches/server/0026-Fix-head-rotation-packet-spam.patch @@ -1,11 +1,11 @@ -From 6b20e46a21deca0711c21528c472f144ee60d593 Mon Sep 17 00:00:00 2001 +From dbc087ad70bcefa394ffbb4ce229282893900eae Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 15:00:46 -0700 Subject: [PATCH] Fix head rotation packet spam diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 1fc2388ea..12112ce7a 100644 +index 1fc2388e..12112ce7 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -411,8 +411,10 @@ public class EntityTrackerEntry { @@ -22,5 +22,5 @@ index 1fc2388ea..12112ce7a 100644 if (this.tracker instanceof EntityLiving) { -- -2.18.0 +2.51.0 diff --git a/patches/server/0028-Add-knockback-reduction.patch b/patches/server/0027-Add-knockback-reduction.patch similarity index 94% rename from patches/server/0028-Add-knockback-reduction.patch rename to patches/server/0027-Add-knockback-reduction.patch index 0efb2d910..c1de46250 100644 --- a/patches/server/0028-Add-knockback-reduction.patch +++ b/patches/server/0027-Add-knockback-reduction.patch @@ -1,11 +1,11 @@ -From c99d106af50781e034442476124a3444a9b9fc6b Mon Sep 17 00:00:00 2001 +From 20e9eee8fc1352ab6cc9f295b4ec63de0ad075e5 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 16:02:05 -0700 Subject: [PATCH] Add knockback reduction diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 1c3677a46..a8f49e4cf 100644 +index 1c3677a4..a8f49e4c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -907,9 +907,15 @@ public abstract class EntityLiving extends Entity { @@ -28,7 +28,7 @@ index 1c3677a46..a8f49e4cf 100644 this.motY += (double) f2; this.motZ -= d1 / (double) f1 * (double) f2; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 4f9179908..a2024f7e3 100644 +index 4f917990..a2024f7e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -44,6 +44,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -57,5 +57,5 @@ index 4f9179908..a2024f7e3 100644 if (entity instanceof EntityArrow) { return ((EntityArrow) entity).isInGround(); -- -2.18.0 +2.51.0 diff --git a/patches/server/0029-Add-log4j-s-exception-marker-to-log-messages-with-ex.patch b/patches/server/0028-Add-log4j-s-exception-marker-to-log-messages-with-ex.patch similarity index 94% rename from patches/server/0029-Add-log4j-s-exception-marker-to-log-messages-with-ex.patch rename to patches/server/0028-Add-log4j-s-exception-marker-to-log-messages-with-ex.patch index 4e2904c52..d23a0c098 100644 --- a/patches/server/0029-Add-log4j-s-exception-marker-to-log-messages-with-ex.patch +++ b/patches/server/0028-Add-log4j-s-exception-marker-to-log-messages-with-ex.patch @@ -1,11 +1,11 @@ -From c4df069253cc1ae38832b954aa2d9715de49f65b Mon Sep 17 00:00:00 2001 +From 1f14c5eaab56e4c64c5a960921d5a619ee7b81e2 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 16:25:52 -0700 Subject: [PATCH] Add log4j's exception marker to log messages with exceptions diff --git a/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java b/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java -index 74ce4b2ec..e35c6cf2e 100644 +index 74ce4b2e..e35c6cf2 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ForwardLogHandler.java @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.util; @@ -42,5 +42,5 @@ index 74ce4b2ec..e35c6cf2e 100644 } -- -2.18.0 +2.51.0 diff --git a/patches/server/0030-Keep-players-in-the-player-list-while-respawning.patch b/patches/server/0029-Keep-players-in-the-player-list-while-respawning.patch similarity index 94% rename from patches/server/0030-Keep-players-in-the-player-list-while-respawning.patch rename to patches/server/0029-Keep-players-in-the-player-list-while-respawning.patch index f5e2744f7..d96222b9d 100644 --- a/patches/server/0030-Keep-players-in-the-player-list-while-respawning.patch +++ b/patches/server/0029-Keep-players-in-the-player-list-while-respawning.patch @@ -1,11 +1,11 @@ -From 3c13b91ed96366df6907e8ffbfd571015ba2de06 Mon Sep 17 00:00:00 2001 +From 25bac597655ba55fe24b2defcc2540de57af206a Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 18:17:01 -0700 Subject: [PATCH] Keep players in the player list while respawning diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 3c2d3197f..f38ab7156 100644 +index 3c2d3197..f38ab715 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -559,6 +559,7 @@ public abstract class PlayerList { @@ -32,5 +32,5 @@ index 3c2d3197f..f38ab7156 100644 this.j.put(entityplayer1.getUniqueID(), entityplayer1); } -- -2.18.0 +2.51.0 diff --git a/patches/server/0031-Implement-equals-and-hashCode-for-DoubleChestInvento.patch b/patches/server/0030-Implement-equals-and-hashCode-for-DoubleChestInvento.patch similarity index 91% rename from patches/server/0031-Implement-equals-and-hashCode-for-DoubleChestInvento.patch rename to patches/server/0030-Implement-equals-and-hashCode-for-DoubleChestInvento.patch index 1379d24d4..1c4f0df55 100644 --- a/patches/server/0031-Implement-equals-and-hashCode-for-DoubleChestInvento.patch +++ b/patches/server/0030-Implement-equals-and-hashCode-for-DoubleChestInvento.patch @@ -1,11 +1,11 @@ -From 85f4b3cafdf9d54a958d407ea1b7dd5a9b52d414 Mon Sep 17 00:00:00 2001 +From aa9877552b976593350d0c8cc90d7064a724576c Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 18:19:52 -0700 Subject: [PATCH] Implement equals() and hashCode() for DoubleChestInventory diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java -index 87252cad4..99b2a4078 100644 +index 87252cad..99b2a407 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryDoubleChest.java @@ -59,4 +59,17 @@ public class CraftInventoryDoubleChest extends CraftInventory implements DoubleC @@ -27,5 +27,5 @@ index 87252cad4..99b2a4078 100644 + } -- -2.18.0 +2.51.0 diff --git a/patches/server/0032-Fix-deadlock-during-shutdown.patch b/patches/server/0031-Fix-deadlock-during-shutdown.patch similarity index 94% rename from patches/server/0032-Fix-deadlock-during-shutdown.patch rename to patches/server/0031-Fix-deadlock-during-shutdown.patch index 547f66098..bcdda9228 100644 --- a/patches/server/0032-Fix-deadlock-during-shutdown.patch +++ b/patches/server/0031-Fix-deadlock-during-shutdown.patch @@ -1,11 +1,11 @@ -From 8dfe097a21379377ba559e793d0b6d9735c8ff2b Mon Sep 17 00:00:00 2001 +From 3455549611fa15ff02ec8c291889822345d4a04c Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 19:59:31 -0700 Subject: [PATCH] Fix deadlock during shutdown diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index f13182c18..eb2231062 100644 +index f13182c1..eb223106 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -20,6 +20,7 @@ import io.netty.util.concurrent.Future; @@ -54,5 +54,5 @@ index f13182c18..eb2231062 100644 } -- -2.18.0 +2.51.0 diff --git a/patches/server/0033-Simple-bulk-block-replacement.patch b/patches/server/0032-Simple-bulk-block-replacement.patch similarity index 96% rename from patches/server/0033-Simple-bulk-block-replacement.patch rename to patches/server/0032-Simple-bulk-block-replacement.patch index 0d32ed7c6..f340cf98e 100644 --- a/patches/server/0033-Simple-bulk-block-replacement.patch +++ b/patches/server/0032-Simple-bulk-block-replacement.patch @@ -1,11 +1,11 @@ -From 69adb4b86d5ab5fffa48755b0239c134f46af194 Mon Sep 17 00:00:00 2001 +From 16c4c777fcce3ba9dbcf8fa954b9474572b4a445 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 20:42:11 -0700 Subject: [PATCH] Simple bulk block replacement diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 8a33e282c..b425a7d37 100644 +index 8a33e282..b425a7d3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -6,12 +6,14 @@ import java.util.Arrays; @@ -61,5 +61,5 @@ index 8a33e282c..b425a7d37 100644 BiomeBase[] biomes = chunkmanager.getBiomes(null, chunkX, chunkZ, 16, 16); float[] temps = new float[biomes.length]; -- -2.18.0 +2.51.0 diff --git a/patches/server/0034-Fix-damageEntity-cancelling-in-vehicles.patch b/patches/server/0033-Fix-damageEntity-cancelling-in-vehicles.patch similarity index 91% rename from patches/server/0034-Fix-damageEntity-cancelling-in-vehicles.patch rename to patches/server/0033-Fix-damageEntity-cancelling-in-vehicles.patch index f77bb46c0..08db21b7e 100644 --- a/patches/server/0034-Fix-damageEntity-cancelling-in-vehicles.patch +++ b/patches/server/0033-Fix-damageEntity-cancelling-in-vehicles.patch @@ -1,11 +1,11 @@ -From 71eee6e066e2d4730612afa0baa1343ca02cf501 Mon Sep 17 00:00:00 2001 +From 87c337e169f2cbefb5e3513b1f01e769927a657e Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 20:45:25 -0700 Subject: [PATCH] Fix damageEntity cancelling in vehicles diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java -index 0e6f8c035..3a6bbe4a9 100644 +index 0e6f8c03..3a6bbe4a 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java @@ -106,7 +106,7 @@ public class EntityBoat extends Entity { @@ -18,7 +18,7 @@ index 0e6f8c035..3a6bbe4a9 100644 // f = event.getDamage(); // TODO Why don't we do this? // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 4bf790cdf..70a8a679a 100644 +index 4bf790cd..70a8a679 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -122,7 +122,7 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT @@ -31,5 +31,5 @@ index 4bf790cdf..70a8a679a 100644 f = (float) event.getDamage(); -- -2.18.0 +2.51.0 diff --git a/patches/server/0035-Fix-combustion-events.patch b/patches/server/0034-Fix-combustion-events.patch similarity index 98% rename from patches/server/0035-Fix-combustion-events.patch rename to patches/server/0034-Fix-combustion-events.patch index 1ad87cdc3..f47327634 100644 --- a/patches/server/0035-Fix-combustion-events.patch +++ b/patches/server/0034-Fix-combustion-events.patch @@ -1,11 +1,11 @@ -From f0e0a8fd87c788cd0776224d68b2e05193542ab0 Mon Sep 17 00:00:00 2001 +From 6c9a998448e7715f81d905d7e2e046a6c6ee1e33 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 22:07:28 -0700 Subject: [PATCH] Fix combustion events diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java -index 329071051..9577483db 100644 +index 32907105..9577483d 100644 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java @@ -188,6 +188,7 @@ public class DispenserRegistry { @@ -25,7 +25,7 @@ index 329071051..9577483db 100644 world.addEntity(entitysmallfireball); // itemstack.a(1); // Handled during event processing diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9746cafda..1f8dd0e2d 100644 +index 9746cafd..1f8dd0e2 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -18,6 +18,8 @@ import org.bukkit.entity.Painting; @@ -146,7 +146,7 @@ index 9746cafda..1f8dd0e2d 100644 } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 897ef18b0..1c61fd7dd 100644 +index 897ef18b..1c61fd7d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1872,6 +1872,35 @@ public abstract class World implements IBlockAccess { @@ -186,7 +186,7 @@ index 897ef18b0..1c61fd7dd 100644 int i = MathHelper.floor(axisalignedbb.a); int j = MathHelper.floor(axisalignedbb.d + 1.0D); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 532a80520..52adc874e 100644 +index 532a8052..52adc874 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -194,7 +194,7 @@ public class CraftEventFactory { @@ -231,5 +231,5 @@ index 532a80520..52adc874e 100644 cause = DamageCause.STARVATION; } else if (source == DamageSource.WITHER) { -- -2.18.0 +2.51.0 diff --git a/patches/server/0036-Add-PlayerAttackEntityEvent.patch b/patches/server/0035-Add-PlayerAttackEntityEvent.patch similarity index 93% rename from patches/server/0036-Add-PlayerAttackEntityEvent.patch rename to patches/server/0035-Add-PlayerAttackEntityEvent.patch index 5ae0cd41e..4864e737d 100644 --- a/patches/server/0036-Add-PlayerAttackEntityEvent.patch +++ b/patches/server/0035-Add-PlayerAttackEntityEvent.patch @@ -1,11 +1,11 @@ -From f8e08409020cf7468e12aa1300ea52b9288329eb Mon Sep 17 00:00:00 2001 +From 08b71c8b9d13a7851eee2f07daf46b237270475c Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 5 Aug 2018 23:56:25 -0700 Subject: [PATCH] Add PlayerAttackEntityEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5a80c00f1..e406e2830 100644 +index 5a80c00f..e406e283 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -45,6 +45,7 @@ import org.bukkit.event.inventory.InventoryCreativeEvent; @@ -30,5 +30,5 @@ index 5a80c00f1..e406e2830 100644 // CraftBukkit start -- -2.18.0 +2.51.0 diff --git a/patches/server/0037-Allow-access-to-ItemStack-handle.patch b/patches/server/0036-Allow-access-to-ItemStack-handle.patch similarity index 88% rename from patches/server/0037-Allow-access-to-ItemStack-handle.patch rename to patches/server/0036-Allow-access-to-ItemStack-handle.patch index 5fb695581..4d277a216 100644 --- a/patches/server/0037-Allow-access-to-ItemStack-handle.patch +++ b/patches/server/0036-Allow-access-to-ItemStack-handle.patch @@ -1,11 +1,11 @@ -From 4db7c846fca75bad72843d5bf1a5821fcda8e3a1 Mon Sep 17 00:00:00 2001 +From 49f601cfc1c2b3c5208385775e46d306d90bb680 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 6 Aug 2018 00:08:36 -0700 Subject: [PATCH] Allow access to ItemStack handle diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 23f05f4db..36a8d4667 100644 +index 23f05f4d..36a8d466 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -90,7 +90,10 @@ public final class CraftItemStack extends ItemStack { @@ -21,5 +21,5 @@ index 23f05f4db..36a8d4667 100644 /** * Mirror -- -2.18.0 +2.51.0 diff --git a/patches/server/0038-Add-setting-to-disable-skull-fetching.patch b/patches/server/0037-Add-setting-to-disable-skull-fetching.patch similarity index 93% rename from patches/server/0038-Add-setting-to-disable-skull-fetching.patch rename to patches/server/0037-Add-setting-to-disable-skull-fetching.patch index 7988f3112..2ba8c1427 100644 --- a/patches/server/0038-Add-setting-to-disable-skull-fetching.patch +++ b/patches/server/0037-Add-setting-to-disable-skull-fetching.patch @@ -1,11 +1,11 @@ -From 1ac85d05984fe239c72c8f0ac50943aa6376f74d Mon Sep 17 00:00:00 2001 +From cc97eb7cb797a0eb5c093d6297d38dfd08b33a28 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 6 Aug 2018 13:29:52 -0700 Subject: [PATCH] Add setting to disable skull fetching diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index 58014c5f1..885050fe7 100644 +index 58014c5f..885050fe 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -17,6 +17,7 @@ import java.util.concurrent.TimeUnit; @@ -30,7 +30,7 @@ index 58014c5f1..885050fe7 100644 } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index b9d185d99..7ab410398 100644 +index b9d185d9..7ab41039 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -226,6 +226,12 @@ public class SpigotConfig @@ -47,5 +47,5 @@ index b9d185d99..7ab410398 100644 private static void bungee() { if ( version < 4 ) -- -2.18.0 +2.51.0 diff --git a/patches/server/0039-Fake-name-and-skin-API.patch b/patches/server/0038-Fake-name-and-skin-API.patch similarity index 99% rename from patches/server/0039-Fake-name-and-skin-API.patch rename to patches/server/0038-Fake-name-and-skin-API.patch index 06bb6567a..c7cc75760 100644 --- a/patches/server/0039-Fake-name-and-skin-API.patch +++ b/patches/server/0038-Fake-name-and-skin-API.patch @@ -1,4 +1,4 @@ -From 458f1ea3d33ffc9eb57e63ebe819eee47c99681b Mon Sep 17 00:00:00 2001 +From 9d7aeb2528d0d743af302fd9fd628a4644295497 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 6 Aug 2018 16:22:22 -0700 Subject: [PATCH] Fake name and skin API @@ -805,5 +805,5 @@ index 00000000..43345fa5 + } +} -- -2.19.0 +2.51.0 diff --git a/patches/server/0040-Expose-the-player-list-packet.patch b/patches/server/0039-Expose-the-player-list-packet.patch similarity index 95% rename from patches/server/0040-Expose-the-player-list-packet.patch rename to patches/server/0039-Expose-the-player-list-packet.patch index 4e2e8c313..7c1e83dd9 100644 --- a/patches/server/0040-Expose-the-player-list-packet.patch +++ b/patches/server/0039-Expose-the-player-list-packet.patch @@ -1,11 +1,11 @@ -From 9e70b8a2f4ab9dcc96f4b9955a65fef4ab454cb9 Mon Sep 17 00:00:00 2001 +From 7b22cf96f62fcc1daecc5e008ce43fa5744b8645 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 7 Aug 2018 00:58:35 -0700 Subject: [PATCH] Expose the player list packet diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java -index 658c42389..ad6bdace0 100644 +index 658c4238..ad6bdace 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java @@ -129,6 +129,15 @@ public class PacketPlayOutPlayerInfo implements Packet { @@ -50,5 +50,5 @@ index 658c42389..ad6bdace0 100644 private final WorldSettings.EnumGamemode c; private final GameProfile d; -- -2.18.0 +2.51.0 diff --git a/patches/server/0041-Add-invis-override-API.patch b/patches/server/0040-Add-invis-override-API.patch similarity index 98% rename from patches/server/0041-Add-invis-override-API.patch rename to patches/server/0040-Add-invis-override-API.patch index 9bd16c60c..53174b64d 100644 --- a/patches/server/0041-Add-invis-override-API.patch +++ b/patches/server/0040-Add-invis-override-API.patch @@ -1,4 +1,4 @@ -From c0d21d6f9074398fbd6bca2d11c60435d920f181 Mon Sep 17 00:00:00 2001 +From a830edff7fefe69f92363d7e8d711d850715ae58 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 7 Aug 2018 01:17:15 -0700 Subject: [PATCH] Add invis override API @@ -94,5 +94,5 @@ index 2c266649..462fb45e 100644 public Map serialize() { Map result = new LinkedHashMap(); -- -2.19.0 +2.51.0 diff --git a/patches/server/0042-Spawn-egg-interaction-with-spawners-can-be-cancelled.patch b/patches/server/0041-Spawn-egg-interaction-with-spawners-can-be-cancelled.patch similarity index 94% rename from patches/server/0042-Spawn-egg-interaction-with-spawners-can-be-cancelled.patch rename to patches/server/0041-Spawn-egg-interaction-with-spawners-can-be-cancelled.patch index 08a9a4b2a..3d8b2b7a1 100644 --- a/patches/server/0042-Spawn-egg-interaction-with-spawners-can-be-cancelled.patch +++ b/patches/server/0041-Spawn-egg-interaction-with-spawners-can-be-cancelled.patch @@ -1,11 +1,11 @@ -From 365c23d5f96c4f0412c55459a82a97a74fe56866 Mon Sep 17 00:00:00 2001 +From 2573cbad21edff56d96834e333f693b1be1ffd6d Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 7 Aug 2018 01:35:01 -0700 Subject: [PATCH] Spawn egg interaction with spawners can be cancelled diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java -index 4bf4df87a..9d621012d 100644 +index 4bf4df87..9d621012 100644 --- a/src/main/java/net/minecraft/server/BlockMobSpawner.java +++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java @@ -44,4 +44,27 @@ public class BlockMobSpawner extends BlockContainer { @@ -37,7 +37,7 @@ index 4bf4df87a..9d621012d 100644 + // SportBukkit end } diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java -index b145d6d8c..6d418c33e 100644 +index b145d6d8..6d418c33 100644 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java @@ -32,6 +32,8 @@ public class ItemMonsterEgg extends Item { @@ -59,5 +59,5 @@ index b145d6d8c..6d418c33e 100644 blockposition = blockposition.shift(enumdirection); double d0 = 0.0D; -- -2.18.0 +2.51.0 diff --git a/patches/server/0043-Efficiently-search-for-blocks-by-material.patch b/patches/server/0042-Efficiently-search-for-blocks-by-material.patch similarity index 95% rename from patches/server/0043-Efficiently-search-for-blocks-by-material.patch rename to patches/server/0042-Efficiently-search-for-blocks-by-material.patch index f9d97d6ea..45ff4a6f3 100644 --- a/patches/server/0043-Efficiently-search-for-blocks-by-material.patch +++ b/patches/server/0042-Efficiently-search-for-blocks-by-material.patch @@ -1,11 +1,11 @@ -From c7b362124513b7de85274f3e4ceb07189202dc3c Mon Sep 17 00:00:00 2001 +From 6e8b5316b90768789aa5d59ce366403631e399e5 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 7 Aug 2018 01:39:44 -0700 Subject: [PATCH] Efficiently search for blocks by material diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index b425a7d37..80de4eb16 100644 +index b425a7d3..80de4eb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit; @@ -56,5 +56,5 @@ index b425a7d37..80de4eb16 100644 int count = 0, index = 0; net.minecraft.server.Chunk chunk = getHandle(); -- -2.18.0 +2.51.0 diff --git a/patches/server/0044-Fix-FallingSand-creating-invisible-blocks.patch b/patches/server/0043-Fix-FallingSand-creating-invisible-blocks.patch similarity index 94% rename from patches/server/0044-Fix-FallingSand-creating-invisible-blocks.patch rename to patches/server/0043-Fix-FallingSand-creating-invisible-blocks.patch index 605d62e8d..7b908a768 100644 --- a/patches/server/0044-Fix-FallingSand-creating-invisible-blocks.patch +++ b/patches/server/0043-Fix-FallingSand-creating-invisible-blocks.patch @@ -1,11 +1,11 @@ -From 3ee5e2515eceab2dbeac3f294acfca0ab7f1354c Mon Sep 17 00:00:00 2001 +From 7531624dda549163f8c349689c76c610ae4b701a Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 7 Aug 2018 01:42:58 -0700 Subject: [PATCH] Fix FallingSand creating invisible blocks diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1c61fd7dd..a19c7f71c 100644 +index 1c61fd7d..a19c7f71 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -994,6 +994,18 @@ public abstract class World implements IBlockAccess { @@ -28,5 +28,5 @@ index 1c61fd7dd..a19c7f71c 100644 int i = MathHelper.floor(entity.locX / 16.0D); int j = MathHelper.floor(entity.locZ / 16.0D); -- -2.18.0 +2.51.0 diff --git a/patches/server/0045-Fix-sending-irrelevant-block-updates-to-the-client.patch b/patches/server/0044-Fix-sending-irrelevant-block-updates-to-the-client.patch similarity index 92% rename from patches/server/0045-Fix-sending-irrelevant-block-updates-to-the-client.patch rename to patches/server/0044-Fix-sending-irrelevant-block-updates-to-the-client.patch index 4dbf6ee4c..130091eb5 100644 --- a/patches/server/0045-Fix-sending-irrelevant-block-updates-to-the-client.patch +++ b/patches/server/0044-Fix-sending-irrelevant-block-updates-to-the-client.patch @@ -1,11 +1,11 @@ -From bc46a7b65ce00a1b54d6b074cfb8e5edb05df211 Mon Sep 17 00:00:00 2001 +From 60dea3d03aca38dc1f433c04a1517f85c9a86da5 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 7 Aug 2018 01:59:49 -0700 Subject: [PATCH] Fix sending irrelevant block updates to the client diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a19c7f71c..72c2494fa 100644 +index a19c7f71..72c2494f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -442,7 +442,7 @@ public abstract class World implements IBlockAccess { @@ -18,5 +18,5 @@ index a19c7f71c..72c2494fa 100644 } -- -2.18.0 +2.51.0 diff --git a/patches/server/0046-Cancel-piston-retraction-without-creating-client-gho.patch b/patches/server/0045-Cancel-piston-retraction-without-creating-client-gho.patch similarity index 97% rename from patches/server/0046-Cancel-piston-retraction-without-creating-client-gho.patch rename to patches/server/0045-Cancel-piston-retraction-without-creating-client-gho.patch index add7b8ec5..d3ec4fd13 100644 --- a/patches/server/0046-Cancel-piston-retraction-without-creating-client-gho.patch +++ b/patches/server/0045-Cancel-piston-retraction-without-creating-client-gho.patch @@ -1,11 +1,11 @@ -From 5b8559e79f0f968f22f564c56b1dc57f0f989810 Mon Sep 17 00:00:00 2001 +From fcd78732ff29e40db548539ba7983e514f3c8283 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 7 Aug 2018 02:05:13 -0700 Subject: [PATCH] Cancel piston retraction without creating client ghost blocks diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java -index b582f4bcd..cebbc6414 100644 +index b582f4bc..cebbc641 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -136,6 +136,10 @@ public class BlockPiston extends Block { @@ -61,7 +61,7 @@ index b582f4bcd..cebbc6414 100644 int j; BlockPosition blockposition1; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 52adc874e..e0300247a 100644 +index 52adc874..e0300247 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1,6 +1,7 @@ @@ -133,5 +133,5 @@ index 52adc874e..e0300247a 100644 + } } -- -2.18.0 +2.51.0 diff --git a/patches/server/0047-Force-update-player-velocity.patch b/patches/server/0046-Force-update-player-velocity.patch similarity index 92% rename from patches/server/0047-Force-update-player-velocity.patch rename to patches/server/0046-Force-update-player-velocity.patch index 6a618345e..23b2c594a 100644 --- a/patches/server/0047-Force-update-player-velocity.patch +++ b/patches/server/0046-Force-update-player-velocity.patch @@ -1,11 +1,11 @@ -From 8ba90d7dc159e9119fd7ff71795cf21fa4d93173 Mon Sep 17 00:00:00 2001 +From 6eb9300170c27e1ac46fb0c97d800ff0917daa5a Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 7 Aug 2018 02:11:56 -0700 Subject: [PATCH] Force update player velocity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 462fb45e7..c7e96decd 100644 +index 462fb45e..c7e96dec 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1735,6 +1735,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -32,5 +32,5 @@ index 462fb45e7..c7e96decd 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.18.0 +2.51.0 diff --git a/patches/server/0048-Relative-teleport-API.patch b/patches/server/0047-Relative-teleport-API.patch similarity index 96% rename from patches/server/0048-Relative-teleport-API.patch rename to patches/server/0047-Relative-teleport-API.patch index 5568ad83d..c2ea35fab 100644 --- a/patches/server/0048-Relative-teleport-API.patch +++ b/patches/server/0047-Relative-teleport-API.patch @@ -1,4 +1,4 @@ -From da492c426d15d7e89b3994d8e8e917427d4d1cbe Mon Sep 17 00:00:00 2001 +From 073212b57ebe029d675f7add3e9abd710e624dbd Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 7 Aug 2018 02:23:15 -0700 Subject: [PATCH] Relative teleport API @@ -47,5 +47,5 @@ index c7e96dec..c7831367 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.23.0 +2.51.0 diff --git a/patches/server/0049-Correct-falling-block-vertical-offset.patch b/patches/server/0048-Correct-falling-block-vertical-offset.patch similarity index 88% rename from patches/server/0049-Correct-falling-block-vertical-offset.patch rename to patches/server/0048-Correct-falling-block-vertical-offset.patch index 033779932..dfd909c4d 100644 --- a/patches/server/0049-Correct-falling-block-vertical-offset.patch +++ b/patches/server/0048-Correct-falling-block-vertical-offset.patch @@ -1,11 +1,11 @@ -From 24587907bae96daeee7fe07774d052899456c02a Mon Sep 17 00:00:00 2001 +From 25856097fb402c5cfe6820b42eeb40d5066cdda2 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 7 Aug 2018 02:31:47 -0700 Subject: [PATCH] Correct falling block vertical offset diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 764007093..ae93d76e7 100644 +index 76400709..ae93d76e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -890,7 +890,7 @@ public class CraftWorld implements World { @@ -18,5 +18,5 @@ index 764007093..ae93d76e7 100644 // PaperSpigot start - Add FallingBlock source location API -- -2.18.0 +2.51.0 diff --git a/patches/server/0050-Add-CanDestroy-and-CanPlaceOn-to-ItemMeta.patch b/patches/server/0049-Add-CanDestroy-and-CanPlaceOn-to-ItemMeta.patch similarity index 99% rename from patches/server/0050-Add-CanDestroy-and-CanPlaceOn-to-ItemMeta.patch rename to patches/server/0049-Add-CanDestroy-and-CanPlaceOn-to-ItemMeta.patch index b404aecac..19b1e2e10 100644 --- a/patches/server/0050-Add-CanDestroy-and-CanPlaceOn-to-ItemMeta.patch +++ b/patches/server/0049-Add-CanDestroy-and-CanPlaceOn-to-ItemMeta.patch @@ -1,4 +1,4 @@ -From 15d9fa44ef884314c900d0ac391f84274258392d Mon Sep 17 00:00:00 2001 +From 71501a3dd27da29dd2f4ff3f3b7015ae50464e5d Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 7 Aug 2018 21:42:47 -0700 Subject: [PATCH] Add CanDestroy and CanPlaceOn to ItemMeta @@ -190,5 +190,5 @@ index eaaa6a11..16fc76ad 100644 REPAIR.NBT, ENCHANTMENTS.NBT, -- -2.19.0 +2.51.0 diff --git a/patches/server/0051-Accurate-block-hit-checking.patch b/patches/server/0050-Accurate-block-hit-checking.patch similarity index 96% rename from patches/server/0051-Accurate-block-hit-checking.patch rename to patches/server/0050-Accurate-block-hit-checking.patch index 27e22f509..27c181d1b 100644 --- a/patches/server/0051-Accurate-block-hit-checking.patch +++ b/patches/server/0050-Accurate-block-hit-checking.patch @@ -1,11 +1,11 @@ -From 133b1b721f2c2bbedb6081bd399b77b840e6fee1 Mon Sep 17 00:00:00 2001 +From 38eed7ef57f22c87bea8e66eec770694beec77c0 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 00:24:49 -0700 Subject: [PATCH] Accurate block hit checking diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ae93d76e7..a1ffce430 100644 +index ae93d76e..a1ffce43 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -54,6 +54,7 @@ import org.bukkit.inventory.ItemStack; @@ -47,7 +47,7 @@ index ae93d76e7..a1ffce430 100644 return CraftBlock.biomeBaseToBiome(this.world.getBiome(new BlockPosition(x, 0, z))); } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 22a80551b..34ff57900 100644 +index 22a80551..34ff5790 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -23,6 +23,8 @@ import org.bukkit.inventory.ItemStack; @@ -89,7 +89,7 @@ index 22a80551b..34ff57900 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e0704aec3..7f426d34f 100644 +index c7831367..b1eb145c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -70,6 +70,7 @@ import org.bukkit.plugin.Plugin; @@ -124,5 +124,5 @@ index e0704aec3..7f426d34f 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.18.0 +2.51.0 diff --git a/patches/server/0052-Improve-Permissible-interface.patch b/patches/server/0051-Improve-Permissible-interface.patch similarity index 99% rename from patches/server/0052-Improve-Permissible-interface.patch rename to patches/server/0051-Improve-Permissible-interface.patch index e96e319d2..537a603f7 100644 --- a/patches/server/0052-Improve-Permissible-interface.patch +++ b/patches/server/0051-Improve-Permissible-interface.patch @@ -1,4 +1,4 @@ -From 574005654170b2e70e16172b3e86de11c0a1264a Mon Sep 17 00:00:00 2001 +From 691c2851555fb4c2a5e932698326aea374d08603 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 00:49:37 -0700 Subject: [PATCH] Improve Permissible interface @@ -390,5 +390,5 @@ index f2c30225..1498bec6 100644 public Server getServer() { return Bukkit.getServer(); -- -2.19.0 +2.51.0 diff --git a/patches/server/0053-Improve-BlockState-API.patch b/patches/server/0052-Improve-BlockState-API.patch similarity index 94% rename from patches/server/0053-Improve-BlockState-API.patch rename to patches/server/0052-Improve-BlockState-API.patch index 280732081..1ccd6f229 100644 --- a/patches/server/0053-Improve-BlockState-API.patch +++ b/patches/server/0052-Improve-BlockState-API.patch @@ -1,11 +1,11 @@ -From 538f4a0a4331873e54ad4aa132ef57f6074d5216 Mon Sep 17 00:00:00 2001 +From 07c9b261d106d2e2bc940d7a183aa395beceecdd Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 01:17:33 -0700 Subject: [PATCH] Improve BlockState API diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java -index 4a8c8141b..8a2a578af 100644 +index 4a8c8141..8a2a578a 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java @@ -83,19 +83,32 @@ public class CraftBlockState implements BlockState { @@ -53,5 +53,5 @@ index 4a8c8141b..8a2a578af 100644 public MaterialData getData() { -- -2.18.0 +2.51.0 diff --git a/patches/server/0054-Add-ExplosionPrimeByEntityEvent.patch b/patches/server/0053-Add-ExplosionPrimeByEntityEvent.patch similarity index 97% rename from patches/server/0054-Add-ExplosionPrimeByEntityEvent.patch rename to patches/server/0053-Add-ExplosionPrimeByEntityEvent.patch index 304f85685..2552ec475 100644 --- a/patches/server/0054-Add-ExplosionPrimeByEntityEvent.patch +++ b/patches/server/0053-Add-ExplosionPrimeByEntityEvent.patch @@ -1,11 +1,11 @@ -From bd7ae89992325547c99eb695ff7784b04104817d Mon Sep 17 00:00:00 2001 +From 523b04ca9ae5d9aad5ad51b3abc0826e9fbe497b Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 13:03:10 -0700 Subject: [PATCH] Add ExplosionPrimeByEntityEvent diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java -index 8676196a4..9fc46d831 100644 +index 8676196a..9fc46d83 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -65,7 +65,7 @@ index 8676196a4..9fc46d831 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index af6df0546..8c33db47b 100644 +index af6df054..8c33db47 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -3,6 +3,8 @@ package net.minecraft.server; @@ -122,7 +122,7 @@ index af6df0546..8c33db47b 100644 if (!event.isCancelled()) { this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire(), flag); diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java -index 07533e4a6..0e348cf4b 100644 +index 07533e4a..0e348cf4 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -148,5 +148,5 @@ index 07533e4a6..0e348cf4b 100644 if (event.isCancelled()) { this.dead = false; -- -2.18.0 +2.51.0 diff --git a/patches/server/0055-Retrieve-metadata-by-plugin.patch b/patches/server/0054-Retrieve-metadata-by-plugin.patch similarity index 97% rename from patches/server/0055-Retrieve-metadata-by-plugin.patch rename to patches/server/0054-Retrieve-metadata-by-plugin.patch index 3419b7d93..e11b344a4 100644 --- a/patches/server/0055-Retrieve-metadata-by-plugin.patch +++ b/patches/server/0054-Retrieve-metadata-by-plugin.patch @@ -1,4 +1,4 @@ -From e4f91799ad3cb3b48bb26ccd8e20f2b578166501 Mon Sep 17 00:00:00 2001 +From 69645530c5d8df4546de60f14509e4273fcf8b08 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 13:29:27 -0700 Subject: [PATCH] Retrieve metadata by plugin @@ -70,7 +70,7 @@ index 2fb74590..b60e2ff0 100644 return server.getEntityMetadata().getMetadata(this, metadataKey); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7f426d34..9ef1fa59 100644 +index b1eb145c..b5018b64 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1489,6 +1489,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -86,5 +86,5 @@ index 7f426d34..9ef1fa59 100644 public List getMetadata(String metadataKey) { return server.getPlayerMetadata().getMetadata(this, metadataKey); -- -2.19.0 +2.51.0 diff --git a/patches/server/0056-Custom-replacement-for-eaten-items.patch b/patches/server/0055-Custom-replacement-for-eaten-items.patch similarity index 97% rename from patches/server/0056-Custom-replacement-for-eaten-items.patch rename to patches/server/0055-Custom-replacement-for-eaten-items.patch index 93d6b5ffe..fed1201dc 100644 --- a/patches/server/0056-Custom-replacement-for-eaten-items.patch +++ b/patches/server/0055-Custom-replacement-for-eaten-items.patch @@ -1,11 +1,11 @@ -From 01d4b555082afad954bb5d4de3cb0fe5b8ce800d Mon Sep 17 00:00:00 2001 +From 47de2222e435c72d2a16451b18333138af4f5257 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 14:41:33 -0700 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 0ad4edb83..9bc418b1a 100644 +index 0ad4edb8..9bc418b1 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -300,7 +300,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -70,5 +70,5 @@ index 0ad4edb83..9bc418b1a 100644 if (itemstack != this.g || itemstack != null && itemstack.count != i) { this.inventory.items[this.inventory.itemInHandIndex] = itemstack; -- -2.18.0 +2.51.0 diff --git a/patches/server/0057-Override-creation-settings-of-existing-world.patch b/patches/server/0056-Override-creation-settings-of-existing-world.patch similarity index 96% rename from patches/server/0057-Override-creation-settings-of-existing-world.patch rename to patches/server/0056-Override-creation-settings-of-existing-world.patch index b6c9d9a77..ab219ecd4 100644 --- a/patches/server/0057-Override-creation-settings-of-existing-world.patch +++ b/patches/server/0056-Override-creation-settings-of-existing-world.patch @@ -1,11 +1,11 @@ -From 71e182ae3b70f4fa33978504647820c75f2856c9 Mon Sep 17 00:00:00 2001 +From 31d7ca30c68e4bedccedb74ceb9151b80f90b190 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 14:58:41 -0700 Subject: [PATCH] Override creation settings of existing world diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index dd04d211d..e1e1b1e85 100644 +index dd04d211..e1e1b1e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -857,6 +857,25 @@ public final class CraftServer implements Server { @@ -54,5 +54,5 @@ index dd04d211d..e1e1b1e85 100644 worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end) WorldServer internal = (WorldServer) new WorldServer(console, sdm, worlddata, dimension, console.methodProfiler, creator.environment(), generator).b(); -- -2.18.0 +2.51.0 diff --git a/patches/server/0058-Potion-effect-events.patch b/patches/server/0057-Potion-effect-events.patch similarity index 98% rename from patches/server/0058-Potion-effect-events.patch rename to patches/server/0057-Potion-effect-events.patch index 6026af1ea..f2569d57e 100644 --- a/patches/server/0058-Potion-effect-events.patch +++ b/patches/server/0057-Potion-effect-events.patch @@ -1,11 +1,11 @@ -From abaeddcd56e31bd0e49939ff1c982c641680c182 Mon Sep 17 00:00:00 2001 +From 0144cb300326fbd4fc3d7ababcb055fdd8df46ee Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 17:08:31 -0700 Subject: [PATCH] Potion effect events diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a8f49e4cf..7abb458a0 100644 +index a8f49e4c..7abb458a 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -16,11 +16,16 @@ import com.google.common.base.Function; @@ -155,7 +155,7 @@ index a8f49e4cf..7abb458a0 100644 diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtils.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtils.java new file mode 100644 -index 000000000..0303c265a +index 00000000..0303c265 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtils.java @@ -0,0 +1,34 @@ @@ -194,5 +194,5 @@ index 000000000..0303c265a + } +} -- -2.18.0 +2.51.0 diff --git a/patches/server/0059-Physical-interface.patch b/patches/server/0058-Physical-interface.patch similarity index 97% rename from patches/server/0059-Physical-interface.patch rename to patches/server/0058-Physical-interface.patch index e13729262..7a8c4404a 100644 --- a/patches/server/0059-Physical-interface.patch +++ b/patches/server/0058-Physical-interface.patch @@ -1,4 +1,4 @@ -From fd39d30f6cbb56973759e5fb8532b14318a29d2e Mon Sep 17 00:00:00 2001 +From 8b8fabbe1e236df7ffcbbe2ce19a16320b83e82d Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 19:38:37 -0700 Subject: [PATCH] Physical interface @@ -69,5 +69,5 @@ index b8bf7541..70a1023f 100644 public T launchProjectile(Class projectile) { return launchProjectile(projectile, null); -- -2.19.0 +2.51.0 diff --git a/patches/server/0060-Fix-self-damage-being-cancelled-by-FF-PvP-rules.patch b/patches/server/0059-Fix-self-damage-being-cancelled-by-FF-PvP-rules.patch similarity index 91% rename from patches/server/0060-Fix-self-damage-being-cancelled-by-FF-PvP-rules.patch rename to patches/server/0059-Fix-self-damage-being-cancelled-by-FF-PvP-rules.patch index 8ec251673..97b75b24d 100644 --- a/patches/server/0060-Fix-self-damage-being-cancelled-by-FF-PvP-rules.patch +++ b/patches/server/0059-Fix-self-damage-being-cancelled-by-FF-PvP-rules.patch @@ -1,11 +1,11 @@ -From a6e64daaba17c8a2d152c674d51591e40dc9ad43 Mon Sep 17 00:00:00 2001 +From 922aac76b7e2d03ea1b9c408af2bc6515c452e81 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 21:23:42 -0700 Subject: [PATCH] Fix self-damage being cancelled by FF/PvP rules diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 9bc418b1a..38c4c35d1 100644 +index 9bc418b1..38c4c35d 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -831,6 +831,9 @@ public abstract class EntityHuman extends EntityLiving { @@ -19,7 +19,7 @@ index 9bc418b1a..38c4c35d1 100644 if (entityhuman instanceof EntityPlayer) { EntityPlayer thatPlayer = (EntityPlayer) entityhuman; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index cafe5ed5b..a6413bbb0 100644 +index cafe5ed5..a6413bbb 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -510,6 +510,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -31,5 +31,5 @@ index cafe5ed5b..a6413bbb0 100644 } -- -2.18.0 +2.51.0 diff --git a/patches/server/0061-Fix-TNT-damage-being-cancelled-by-friendly-fire-rule.patch b/patches/server/0060-Fix-TNT-damage-being-cancelled-by-friendly-fire-rule.patch similarity index 90% rename from patches/server/0061-Fix-TNT-damage-being-cancelled-by-friendly-fire-rule.patch rename to patches/server/0060-Fix-TNT-damage-being-cancelled-by-friendly-fire-rule.patch index 9eacf9bdb..067380989 100644 --- a/patches/server/0061-Fix-TNT-damage-being-cancelled-by-friendly-fire-rule.patch +++ b/patches/server/0060-Fix-TNT-damage-being-cancelled-by-friendly-fire-rule.patch @@ -1,11 +1,11 @@ -From 4c75c53e3a77a38bb2d3298b91436bd944596c7f Mon Sep 17 00:00:00 2001 +From 585bc3e61b0c0a7491fc49fd16732201a74cba44 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 21:26:26 -0700 Subject: [PATCH] Fix TNT damage being cancelled by friendly-fire rules diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a6413bbb0..8dc314de0 100644 +index a6413bbb..8dc314de 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -488,7 +488,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -18,5 +18,5 @@ index a6413bbb0..8dc314de0 100644 if (entity instanceof EntityHuman && !this.a((EntityHuman) entity)) { -- -2.18.0 +2.51.0 diff --git a/patches/server/0062-Localize-inventory-titles.patch b/patches/server/0061-Localize-inventory-titles.patch similarity index 97% rename from patches/server/0062-Localize-inventory-titles.patch rename to patches/server/0061-Localize-inventory-titles.patch index a08918cae..362289044 100644 --- a/patches/server/0062-Localize-inventory-titles.patch +++ b/patches/server/0061-Localize-inventory-titles.patch @@ -1,11 +1,11 @@ -From c25cc1dd8b2b84471432ef25c8928f3b1b509b96 Mon Sep 17 00:00:00 2001 +From 417b20a95451b6b6b2b625f3a836b6e2d75451f2 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 21:54:00 -0700 Subject: [PATCH] Localize inventory titles diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index d165d5c63..4e5db758a 100644 +index d165d5c6..4e5db758 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -320,7 +320,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -32,7 +32,7 @@ index d165d5c63..4e5db758a 100644 getHandle().activeContainer.addSlotListener(player); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java -index 694da655f..43c2ec472 100644 +index 694da655..43c2ec47 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -4,11 +4,15 @@ import java.util.HashMap; @@ -84,7 +84,7 @@ index 694da655f..43c2ec472 100644 public InventoryType getType() { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java -index e99b8ccae..86834e501 100644 +index e99b8cca..86834e50 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java @@ -4,6 +4,7 @@ import java.util.ArrayList; @@ -147,5 +147,5 @@ index e99b8ccae..86834e501 100644 } } -- -2.18.0 +2.51.0 diff --git a/patches/server/0063-Skull-skin-API.patch b/patches/server/0062-Skull-skin-API.patch similarity index 97% rename from patches/server/0063-Skull-skin-API.patch rename to patches/server/0062-Skull-skin-API.patch index 493f5633c..72bd17df2 100644 --- a/patches/server/0063-Skull-skin-API.patch +++ b/patches/server/0062-Skull-skin-API.patch @@ -1,4 +1,4 @@ -From a12b63e4ae6df490c7780851d45ea26c548318bc Mon Sep 17 00:00:00 2001 +From 3376b3c9e5948b122c6aef9ac5da283ee1dc141f Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Wed, 8 Aug 2018 22:06:30 -0700 Subject: [PATCH] Skull skin API @@ -85,5 +85,5 @@ index 55bbad76..ee1fd938 100644 int applyHash() { final int original; -- -2.19.0 +2.51.0 diff --git a/patches/server/0064-Don-t-nest-if-we-don-t-need-to-when-serealising-text.patch b/patches/server/0063-Don-t-nest-if-we-don-t-need-to-when-serealising-text.patch similarity index 93% rename from patches/server/0064-Don-t-nest-if-we-don-t-need-to-when-serealising-text.patch rename to patches/server/0063-Don-t-nest-if-we-don-t-need-to-when-serealising-text.patch index e3eb31c09..57b1b5947 100644 --- a/patches/server/0064-Don-t-nest-if-we-don-t-need-to-when-serealising-text.patch +++ b/patches/server/0063-Don-t-nest-if-we-don-t-need-to-when-serealising-text.patch @@ -1,4 +1,4 @@ -From 6158084dff3f8c82946b2673a9dec4fab6927f53 Mon Sep 17 00:00:00 2001 +From dcbafa74566b5005228d98fce143cec1969ee030 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 11 Aug 2018 15:04:19 -0700 Subject: [PATCH] Don't nest if we don't need to when serealising text @@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when serealising text diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java -index 6cd5df2e8..63bb0fc7e 100644 +index 6cd5df2e..63bb0fc7 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java @@ -27,7 +27,14 @@ public class PacketPlayOutChat implements Packet { @@ -26,5 +26,5 @@ index 6cd5df2e8..63bb0fc7e 100644 packetdataserializer.a(this.a); } -- -2.18.0 +2.51.0 diff --git a/patches/server/0065-MC-Utils.patch b/patches/server/0064-MC-Utils.patch similarity index 97% rename from patches/server/0065-MC-Utils.patch rename to patches/server/0064-MC-Utils.patch index ae166707d..68e70912c 100644 --- a/patches/server/0065-MC-Utils.patch +++ b/patches/server/0064-MC-Utils.patch @@ -1,11 +1,11 @@ -From fd8465c469272c2de2c9060570cb7797d5c08e9c Mon Sep 17 00:00:00 2001 +From ff5d3d7829f1f01182066be0d20fe4606d43c5f2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:55:47 -0400 Subject: [PATCH] MC Utils diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index ab0d41cad..82f1443cb 100644 +index ab0d41ca..82f1443c 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -821,6 +821,7 @@ public class Chunk { @@ -17,7 +17,7 @@ index ab0d41cad..82f1443cb 100644 // CraftBukkit start TileEntity tileentity = null; diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java -index 652c07975..ca693b028 100644 +index 652c0797..ca693b02 100644 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java @@ -10,6 +10,8 @@ public class ChunkCoordIntPair { @@ -30,7 +30,7 @@ index 652c07975..ca693b028 100644 return (long) i & 4294967295L | ((long) j & 4294967295L) << 32; } diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index 064d0b204..c0fbb3cc3 100644 +index 064d0b20..c0fbb3cc 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -12,6 +12,10 @@ import org.apache.logging.log4j.Logger; @@ -53,7 +53,7 @@ index 064d0b204..c0fbb3cc3 100644 } diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 015ce2834..55be2b712 100644 +index 015ce283..55be2b71 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -13,6 +13,7 @@ import org.bukkit.Location; @@ -85,7 +85,7 @@ index 015ce2834..55be2b712 100644 } diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java new file mode 100644 -index 000000000..aefc829b0 +index 00000000..aefc829b --- /dev/null +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -0,0 +1,111 @@ @@ -201,7 +201,7 @@ index 000000000..aefc829b0 + } +} diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java -index a0e6b0ff5..cb102811b 100644 +index a0e6b0ff..cb102811 100644 --- a/src/main/java/net/minecraft/server/NBTTagList.java +++ b/src/main/java/net/minecraft/server/NBTTagList.java @@ -12,7 +12,7 @@ import org.apache.logging.log4j.Logger; @@ -214,7 +214,7 @@ index a0e6b0ff5..cb102811b 100644 public NBTTagList() {} diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b46ac6abc..18343f7c3 100644 +index b46ac6ab..18343f7c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -78,8 +78,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -237,5 +237,5 @@ index b46ac6abc..18343f7c3 100644 return System.nanoTime() / 1000000L; } -- -2.18.0 +2.51.0 diff --git a/patches/server/0066-Fix-Furnace-cook-time-bug.patch b/patches/server/0065-Fix-Furnace-cook-time-bug.patch similarity index 91% rename from patches/server/0066-Fix-Furnace-cook-time-bug.patch rename to patches/server/0065-Fix-Furnace-cook-time-bug.patch index c61d95b83..c54d28747 100644 --- a/patches/server/0066-Fix-Furnace-cook-time-bug.patch +++ b/patches/server/0065-Fix-Furnace-cook-time-bug.patch @@ -1,4 +1,4 @@ -From 4b698b4e3e1eb9f4876a43dbcec6555633352170 Mon Sep 17 00:00:00 2001 +From 6f0eafcb91323f0b5c5f3f5d34709cb76f7edacc Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:24:53 -0400 Subject: [PATCH] Fix Furnace cook time bug @@ -9,7 +9,7 @@ cook in the expected amount of time as the cook time was not decremented correct This patch ensures that furnaces cook to the correct wall time expectation. diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 0e3f35a6e..37a43fdc8 100644 +index 0e3f35a6..37a43fdc 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -187,7 +187,7 @@ public class TileEntityFurnace extends TileEntityContainer implements IUpdatePla @@ -22,5 +22,5 @@ index 0e3f35a6e..37a43fdc8 100644 this.burn(); flag1 = true; -- -2.18.0 +2.51.0 diff --git a/patches/server/0067-Add-World-Util-Methods.patch b/patches/server/0066-Add-World-Util-Methods.patch similarity index 96% rename from patches/server/0067-Add-World-Util-Methods.patch rename to patches/server/0066-Add-World-Util-Methods.patch index 8fb109704..216faa954 100644 --- a/patches/server/0067-Add-World-Util-Methods.patch +++ b/patches/server/0066-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From d1955c23df6c7684bb879211f47d9daad532147f Mon Sep 17 00:00:00 2001 +From aa7890180ee3133a53aaa9dec5d68e2c972069de Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 11 Aug 2018 23:04:17 -0700 Subject: [PATCH] Add World Util Methods @@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 82f1443cb..0a76e5d39 100644 +index 82f1443c..0a76e5d3 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -692,6 +692,7 @@ public class Chunk { @@ -18,7 +18,7 @@ index 82f1443cb..0a76e5d39 100644 int j = blockposition.getX() & 15; int k = blockposition.getY(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 72c2494fa..6dd39cf0a 100644 +index 72c2494f..6dd39cf0 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -70,7 +70,7 @@ public abstract class World implements IBlockAccess { @@ -79,5 +79,5 @@ index 72c2494fa..6dd39cf0a 100644 public IBlockData getType(BlockPosition blockposition) { -- -2.18.0 +2.51.0 diff --git a/patches/server/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 94% rename from patches/server/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/server/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch index fa1b5a87a..f07408e48 100644 --- a/patches/server/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/patches/server/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,11 +1,11 @@ -From ade582c4c9afad86e274b866dff9720d7d88fcac Mon Sep 17 00:00:00 2001 +From f422df4dee9fd0dd0ad0d61da69000215b8d0051 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 11 Aug 2018 23:12:05 -0700 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 7abb458a0..074735284 100644 +index 7abb458a..07473528 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -422,7 +422,13 @@ public abstract class EntityLiving extends Entity { @@ -44,7 +44,7 @@ index 7abb458a0..074735284 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9ef1fa594..dc4e343db 100644 +index b5018b64..8aba4665 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1671,6 +1671,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -56,5 +56,5 @@ index 9ef1fa594..dc4e343db 100644 } -- -2.18.0 +2.51.0 diff --git a/patches/server/0069-Use-a-Shared-Random-for-Entities.patch b/patches/server/0068-Use-a-Shared-Random-for-Entities.patch similarity index 94% rename from patches/server/0069-Use-a-Shared-Random-for-Entities.patch rename to patches/server/0068-Use-a-Shared-Random-for-Entities.patch index 835a36682..96ba33ee6 100644 --- a/patches/server/0069-Use-a-Shared-Random-for-Entities.patch +++ b/patches/server/0068-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From c100d4364f0a3e62bf1fa7ed09fbea82cf769f96 Mon Sep 17 00:00:00 2001 +From ebf84e226837b670f6b7dfa59733ec6216fc3c95 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 11 Aug 2018 23:17:20 -0700 Subject: [PATCH] Use a Shared Random for Entities @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1f8dd0e2d..6482842b4 100644 +index 1f8dd0e2..6482842b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -7,6 +7,7 @@ import java.util.UUID; @@ -48,5 +48,5 @@ index 1f8dd0e2d..6482842b4 100644 this.justCreated = true; this.uniqueID = MathHelper.a(this.random); -- -2.18.0 +2.51.0 diff --git a/patches/server/0070-Don-t-teleport-dead-entities.patch b/patches/server/0069-Don-t-teleport-dead-entities.patch similarity index 89% rename from patches/server/0070-Don-t-teleport-dead-entities.patch rename to patches/server/0069-Don-t-teleport-dead-entities.patch index 81d47c9da..154afd31d 100644 --- a/patches/server/0070-Don-t-teleport-dead-entities.patch +++ b/patches/server/0069-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From e9be4ce9a0f67e9c01cc278b39bdfb2eca057f12 Mon Sep 17 00:00:00 2001 +From fd93211c4e8c6f2bdb28107fec8f959354fba00e Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 11 Aug 2018 23:18:57 -0700 Subject: [PATCH] Don't teleport dead entities @@ -7,7 +7,7 @@ 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 6482842b4..d3c54d38e 100644 +index 6482842b..d3c54d38 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2007,7 +2007,7 @@ public abstract class Entity implements ICommandListener { @@ -20,5 +20,5 @@ index 6482842b4..d3c54d38e 100644 WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle(); int i = worldserver1.dimension; -- -2.18.0 +2.51.0 diff --git a/patches/server/0071-Optimize-Chunk-Access.patch b/patches/server/0070-Optimize-Chunk-Access.patch similarity index 94% rename from patches/server/0071-Optimize-Chunk-Access.patch rename to patches/server/0070-Optimize-Chunk-Access.patch index 76d31a2b7..0f351f46c 100644 --- a/patches/server/0071-Optimize-Chunk-Access.patch +++ b/patches/server/0070-Optimize-Chunk-Access.patch @@ -1,4 +1,4 @@ -From 69066316fc45bc2b220477caeaaba3bc870eb33a Mon Sep 17 00:00:00 2001 +From 7b98e73b08f91560d11ae27e52f6388009e26d06 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 27 Aug 2015 01:15:02 -0400 Subject: [PATCH] Optimize Chunk Access @@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT Optimize this look up by using a Last Access cache. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 0a76e5d39..0faa0bcbe 100644 +index 0a76e5d3..0faa0bcb 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -32,6 +32,7 @@ public class Chunk { @@ -29,7 +29,7 @@ index 0a76e5d39..0faa0bcbe 100644 for (int k = 0; k < this.entitySlices.length; ++k) { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index c4dab42bd..573303e3e 100644 +index c4dab42b..573303e3 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -34,7 +34,26 @@ public class ChunkProviderServer implements IChunkProvider { @@ -61,5 +61,5 @@ index c4dab42bd..573303e3e 100644 public ChunkProviderServer(WorldServer worldserver, IChunkLoader ichunkloader, IChunkProvider ichunkprovider) { -- -2.18.0 +2.51.0 diff --git a/patches/server/0072-Check-async-remove-unused-vars-GH-159.patch b/patches/server/0071-Check-async-remove-unused-vars-GH-159.patch similarity index 93% rename from patches/server/0072-Check-async-remove-unused-vars-GH-159.patch rename to patches/server/0071-Check-async-remove-unused-vars-GH-159.patch index b22bf60e0..e07890611 100644 --- a/patches/server/0072-Check-async-remove-unused-vars-GH-159.patch +++ b/patches/server/0071-Check-async-remove-unused-vars-GH-159.patch @@ -1,11 +1,11 @@ -From 77c859d317712f9928bc5cbca06c85215299aa13 Mon Sep 17 00:00:00 2001 +From 23122c6277501dc24a8e9129d5108938f77d06de Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 01:44:12 -0700 Subject: [PATCH] Check async, remove unused vars, GH-159 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 284f4bf2f..a12ae12de 100644 +index 284f4bf2..a12ae12d 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -40,6 +40,7 @@ public final class SpawnerCreature { @@ -28,5 +28,5 @@ index 284f4bf2f..a12ae12de 100644 if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) { Iterator iterator1 = this.b.iterator(); -- -2.18.0 +2.51.0 diff --git a/patches/server/0073-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch b/patches/server/0072-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch similarity index 95% rename from patches/server/0073-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch rename to patches/server/0072-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch index 9b3faa997..4ef912e0e 100644 --- a/patches/server/0073-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch +++ b/patches/server/0072-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch @@ -1,4 +1,4 @@ -From c3652c3dc2f451fd78521fea2d92aa12b2ee5cee Mon Sep 17 00:00:00 2001 +From d8dbdec36a0b3f9c076b728119c3500a8e41caa8 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 01:57:08 -0700 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone @@ -11,7 +11,7 @@ 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/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6dd39cf0a..e16d4a0b0 100644 +index 6dd39cf0..e16d4a0b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -577,7 +577,7 @@ public abstract class World implements IBlockAccess { @@ -24,7 +24,7 @@ index 6dd39cf0a..e16d4a0b0 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 87529552a..bccc52cdf 100644 +index 87529552..bccc52cd 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -27,11 +27,13 @@ import org.bukkit.craftbukkit.util.HashTreeSet; @@ -59,7 +59,7 @@ index 87529552a..bccc52cdf 100644 timing.stopTiming(); // Spigot } else { diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index d6d9899e2..08f58486b 100644 +index d6d9899e..08f58486 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java @@ -222,4 +222,9 @@ public class PaperSpigotConfig @@ -73,5 +73,5 @@ index d6d9899e2..08f58486b 100644 + } } -- -2.18.0 +2.51.0 diff --git a/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0073-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 90% rename from patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/server/0073-Entity-AddTo-RemoveFrom-World-Events.patch index 640441d56..5d701cd81 100644 --- a/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/patches/server/0073-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,11 +1,11 @@ -From 4309f6bac4bb5e20028e732f02216d92460f3f0d Mon Sep 17 00:00:00 2001 +From 8c7dfabb1ff18657596a9773c6427a1a85e2329d Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 02:12:31 -0700 Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e16d4a0b0..34774bc29 100644 +index e16d4a0b..34774bc2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1110,6 +1110,7 @@ public abstract class World implements IBlockAccess { @@ -25,5 +25,5 @@ index e16d4a0b0..34774bc29 100644 } -- -2.18.0 +2.51.0 diff --git a/patches/server/0075-Configurable-Chunk-Inhabited-Timer.patch b/patches/server/0074-Configurable-Chunk-Inhabited-Timer.patch similarity index 91% rename from patches/server/0075-Configurable-Chunk-Inhabited-Timer.patch rename to patches/server/0074-Configurable-Chunk-Inhabited-Timer.patch index 3cd52e5ec..b8c16cf58 100644 --- a/patches/server/0075-Configurable-Chunk-Inhabited-Timer.patch +++ b/patches/server/0074-Configurable-Chunk-Inhabited-Timer.patch @@ -1,4 +1,4 @@ -From 053a2e2e3f64f284b60a6fa4512fa3a7fd58006c Mon Sep 17 00:00:00 2001 +From ca3c65b75ba55ed8acb39c417088f217296612b5 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 02:24:22 -0700 Subject: [PATCH] Configurable Chunk Inhabited Timer @@ -9,7 +9,7 @@ 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/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 0faa0bcbe..92e14e0dd 100644 +index 0faa0bcb..92e14e0d 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1478,7 +1478,7 @@ public class Chunk { @@ -22,7 +22,7 @@ index 0faa0bcbe..92e14e0dd 100644 public void c(long i) { diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java -index 67e56df01..0ec8bcb24 100644 +index 67e56df0..0ec8bcb2 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java @@ -408,4 +408,9 @@ public class PaperSpigotWorldConfig @@ -36,5 +36,5 @@ index 67e56df01..0ec8bcb24 100644 + } } -- -2.18.0 +2.51.0 diff --git a/patches/server/0076-Add-EntityPathfindEvent.patch b/patches/server/0075-Add-EntityPathfindEvent.patch similarity index 94% rename from patches/server/0076-Add-EntityPathfindEvent.patch rename to patches/server/0075-Add-EntityPathfindEvent.patch index 3554b1a2d..f65dcd55d 100644 --- a/patches/server/0076-Add-EntityPathfindEvent.patch +++ b/patches/server/0075-Add-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From 94f46d0856ac3693506fa7ea8d0ac81790937600 Mon Sep 17 00:00:00 2001 +From f7c718fa292b35553dd500b469687f487a31a792 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 02:42:14 -0700 Subject: [PATCH] Add EntityPathfindEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityPathfindEvent Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 8ebe58495..6c1a8547b 100644 +index 8ebe5849..6c1a8547 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -5,7 +5,7 @@ import java.util.List; @@ -35,5 +35,5 @@ index 8ebe58495..6c1a8547b 100644 ChunkCache chunkcache = new ChunkCache(this.c, blockposition.a(-i, -i, -i), blockposition.a(i, i, i), 0); PathEntity pathentity = this.j.a((IBlockAccess) chunkcache, (Entity) this.b, entity, f); -- -2.18.0 +2.51.0 diff --git a/patches/server/0077-Remove-Metadata-on-reload.patch b/patches/server/0076-Remove-Metadata-on-reload.patch similarity index 92% rename from patches/server/0077-Remove-Metadata-on-reload.patch rename to patches/server/0076-Remove-Metadata-on-reload.patch index e4193859a..291eabfbf 100644 --- a/patches/server/0077-Remove-Metadata-on-reload.patch +++ b/patches/server/0076-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From cee76683f9bcb29f54bc4e8851929bf5c08d33a9 Mon Sep 17 00:00:00 2001 +From 81b664610e1022b9736e1456675e3d44fb86d395 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 02:55:36 -0700 Subject: [PATCH] Remove Metadata on reload @@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e1e1b1e85..5c2a18dd3 100644 +index e1e1b1e8..5c2a18dd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -756,8 +756,18 @@ public final class CraftServer implements Server { @@ -30,5 +30,5 @@ index e1e1b1e85..5c2a18dd3 100644 org.spigotmc.SpigotConfig.registerCommands(); // Spigot org.github.paperspigot.PaperSpigotConfig.registerCommands(); // PaperSpigot -- -2.18.0 +2.51.0 diff --git a/patches/server/0078-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch b/patches/server/0077-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch similarity index 96% rename from patches/server/0078-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch rename to patches/server/0077-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch index 6c9b4ae7a..d5f743568 100644 --- a/patches/server/0078-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch +++ b/patches/server/0077-Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch @@ -1,4 +1,4 @@ -From cfa3f13923f8559ecfe6a81407e4b5d8c196cf43 Mon Sep 17 00:00:00 2001 +From d0bd27cff55a1166fc84daea6d5e5e401b7d4f7c Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 03:02:30 -0700 Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks @@ -12,7 +12,7 @@ of unloaded chunks anyways. This keeps behavior consistent, vs inconsistent flowing based on plugin triggered loads. diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java -index b1168dfef..2c91d6d54 100644 +index b1168dfe..2c91d6d5 100644 --- a/src/main/java/net/minecraft/server/BlockFlowing.java +++ b/src/main/java/net/minecraft/server/BlockFlowing.java @@ -107,6 +107,7 @@ public class BlockFlowing extends BlockFluids { @@ -48,5 +48,5 @@ index b1168dfef..2c91d6d54 100644 if (this.material == Material.LAVA) { this.fizz(world, blockposition); -- -2.18.0 +2.51.0 diff --git a/patches/server/0079-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 98% rename from patches/server/0079-Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch index 6b86c602b..50cadac77 100644 --- a/patches/server/0079-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/patches/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch @@ -1,4 +1,4 @@ -From 883d3130fe2eba0408c7587beb23c20851b20062 Mon Sep 17 00:00:00 2001 +From 827de3e408c24e06858f090834332244c8b8be89 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 13:29:19 -0700 Subject: [PATCH] Sanitise RegionFileCache and make configurable. @@ -87,5 +87,5 @@ index 08f58486..248b7f62 100644 public static double weaknessEffectModifier; private static void effectModifiers() -- -2.19.0 +2.51.0 diff --git a/patches/server/0080-Use-Optimized-Collections.patch b/patches/server/0079-Use-Optimized-Collections.patch similarity index 95% rename from patches/server/0080-Use-Optimized-Collections.patch rename to patches/server/0079-Use-Optimized-Collections.patch index 762a04719..66ee0f19e 100644 --- a/patches/server/0080-Use-Optimized-Collections.patch +++ b/patches/server/0079-Use-Optimized-Collections.patch @@ -1,4 +1,4 @@ -From 9245ec9dbe3e9e65a796c6380add7ccd49da203b Mon Sep 17 00:00:00 2001 +From 87c2c2e943df73011d923cf18bd54a59daf0fdf2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 02:13:24 -0400 Subject: [PATCH] Use Optimized Collections @@ -13,7 +13,7 @@ These collections are super fast as seen http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/ diff --git a/pom.xml b/pom.xml -index 092ca7df..ee562d2e 100644 +index bc242390..71681bf6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,11 @@ @@ -51,5 +51,5 @@ index 573303e3..7c81324d 100644 public Chunk get(long key) { if (lastChunkByPos != null && key == lastChunkByPos.chunkKey) { -- -2.19.0 +2.51.0 diff --git a/patches/server/0081-Do-not-load-chunks-for-light-checks.patch b/patches/server/0080-Do-not-load-chunks-for-light-checks.patch similarity index 92% rename from patches/server/0081-Do-not-load-chunks-for-light-checks.patch rename to patches/server/0080-Do-not-load-chunks-for-light-checks.patch index 429bf02a9..f5b57e016 100644 --- a/patches/server/0081-Do-not-load-chunks-for-light-checks.patch +++ b/patches/server/0080-Do-not-load-chunks-for-light-checks.patch @@ -1,4 +1,4 @@ -From 747cafd1ca2dfbcf1cbc511dd876afa576d0e9ee Mon Sep 17 00:00:00 2001 +From f6503f5b1cd7493a4f37761505571e1e7b707e4a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for light checks @@ -19,5 +19,5 @@ index 34774bc2..72c72f87 100644 Chunk chunk = this.getChunkAtWorldCoords(blockposition); -- -2.19.0 +2.51.0 diff --git a/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0081-Add-PlayerUseUnknownEntityEvent.patch similarity index 95% rename from patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch rename to patches/server/0081-Add-PlayerUseUnknownEntityEvent.patch index 413c12bc3..0edb54d51 100644 --- a/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch +++ b/patches/server/0081-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From 6e80b831e903a14f295e7e92a5c08dd6504d415a Mon Sep 17 00:00:00 2001 +From 2efc650daf784a78afe0d12c4b394d19835b7be9 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 23:18:21 -0700 Subject: [PATCH] Add PlayerUseUnknownEntityEvent @@ -34,5 +34,5 @@ index 18343f7c..d23ff402 100644 } -- -2.19.0 +2.51.0 diff --git a/patches/server/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch b/patches/server/0082-Fix-reducedDebugInfo-not-initialized-on-client.patch similarity index 94% rename from patches/server/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch rename to patches/server/0082-Fix-reducedDebugInfo-not-initialized-on-client.patch index 16867b107..eac4c0284 100644 --- a/patches/server/0083-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/patches/server/0082-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,4 +1,4 @@ -From 4b3c8ed761929aa517a52d50e9a558ef854cb4f4 Mon Sep 17 00:00:00 2001 +From 8ec87e3abc923b70477fb37d2eef027e63552d71 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 23:23:43 -0700 Subject: [PATCH] Fix reducedDebugInfo not initialized on client @@ -17,5 +17,5 @@ index ce170c53..108e9515 100644 entityplayer.getStatisticManager().updateStatistics(entityplayer); this.sendScoreboard((ScoreboardServer) worldserver.getScoreboard(), entityplayer); -- -2.19.0 +2.51.0 diff --git a/patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch b/patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch similarity index 96% rename from patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch rename to patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch index 162195609..2bc4e3496 100644 --- a/patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch +++ b/patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,4 +1,4 @@ -From aee59ffa0359e3936454aee7a12b2e1b2e1d5ba3 Mon Sep 17 00:00:00 2001 +From 1f1fb1776761f75fd9c96475be84f6b513785359 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 23:25:46 -0700 Subject: [PATCH] Configurable Grass Spread Tick Rate @@ -32,5 +32,5 @@ index 0ec8bcb2..912d2d5a 100644 + } } -- -2.19.0 +2.51.0 diff --git a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 91% rename from patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index 423097573..d360eaa4d 100644 --- a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,4 +1,4 @@ -From d2883ba2b18abf8915268cc5a61060d23e1aaa66 Mon Sep 17 00:00:00 2001 +From 0a91a1d6927d594f13d3f6f008673fc96e55cc1e Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 12 Aug 2018 23:32:35 -0700 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics @@ -17,5 +17,5 @@ index 72c72f87..b2f68c9b 100644 this.d(blockposition.east(), block); this.d(blockposition.down(), block); -- -2.19.0 +2.51.0 diff --git a/patches/server/0086-Prevent-Fire-from-loading-chunks.patch b/patches/server/0085-Prevent-Fire-from-loading-chunks.patch similarity index 96% rename from patches/server/0086-Prevent-Fire-from-loading-chunks.patch rename to patches/server/0085-Prevent-Fire-from-loading-chunks.patch index 0df9160c2..03c75949a 100644 --- a/patches/server/0086-Prevent-Fire-from-loading-chunks.patch +++ b/patches/server/0085-Prevent-Fire-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 71d27d641d9b65bb10039ca9d4a50cf9166ebeb9 Mon Sep 17 00:00:00 2001 +From cd25b7e963f3b033cfb18a2e5cb0a3643b45f4dd Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 13 Aug 2018 01:38:54 -0700 Subject: [PATCH] Prevent Fire from loading chunks @@ -43,5 +43,5 @@ index 76cd5129..d32552ff 100644 } -- -2.19.0 +2.51.0 diff --git a/patches/server/0087-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0086-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 99% rename from patches/server/0087-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/0086-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index edc939f2a..f3758ee35 100644 --- a/patches/server/0087-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/patches/server/0086-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From 29baabcfecf5dfd1c15676fc89b6ecb2a331ec47 Mon Sep 17 00:00:00 2001 +From 0bd0d9f320b891387be6d559c7afaea0c3a7d07c Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 13 Aug 2018 21:40:08 -0700 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes @@ -147,5 +147,5 @@ index 256a1317..5768cd51 100644 public RenderData() { -- -2.19.0 +2.51.0 diff --git a/patches/server/0088-Do-not-load-chunks-for-pathfinding.patch b/patches/server/0087-Do-not-load-chunks-for-pathfinding.patch similarity index 91% rename from patches/server/0088-Do-not-load-chunks-for-pathfinding.patch rename to patches/server/0087-Do-not-load-chunks-for-pathfinding.patch index 69740d695..864398606 100644 --- a/patches/server/0088-Do-not-load-chunks-for-pathfinding.patch +++ b/patches/server/0087-Do-not-load-chunks-for-pathfinding.patch @@ -1,4 +1,4 @@ -From 7455d8e1ee861671937287e9aad20c1cf7a1f582 Mon Sep 17 00:00:00 2001 +From 8037735689d95fa88206b21339f9adf9006b8a98 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 13 Aug 2018 21:44:29 -0700 Subject: [PATCH] Do not load chunks for pathfinding @@ -18,5 +18,5 @@ index 45d385d3..15e73525 100644 } -- -2.19.0 +2.51.0 diff --git a/patches/server/0089-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0088-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 96% rename from patches/server/0089-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to patches/server/0088-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index 3801ae8e8..253eff3c4 100644 --- a/patches/server/0089-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/patches/server/0088-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,4 +1,4 @@ -From e39f66efaef6ce9c445b02c6f7be30a735eebeab Mon Sep 17 00:00:00 2001 +From 15d7b5ff54198f3b088f17650a5fe51408a2a394 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 13 Aug 2018 21:50:54 -0700 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat @@ -33,5 +33,5 @@ index 248b7f62..1d44af76 100644 public static double weaknessEffectModifier; private static void effectModifiers() -- -2.19.0 +2.51.0 diff --git a/patches/server/0090-System-property-for-disabling-watchdoge.patch b/patches/server/0089-System-property-for-disabling-watchdoge.patch similarity index 92% rename from patches/server/0090-System-property-for-disabling-watchdoge.patch rename to patches/server/0089-System-property-for-disabling-watchdoge.patch index 24ff2ab1e..0fbf5ceef 100644 --- a/patches/server/0090-System-property-for-disabling-watchdoge.patch +++ b/patches/server/0089-System-property-for-disabling-watchdoge.patch @@ -1,4 +1,4 @@ -From d26385ebcecb16d682e5620414b32a25442bd6c9 Mon Sep 17 00:00:00 2001 +From 609b34dece95a8fa58628851fd3bd45da31e3018 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 13 Aug 2018 21:56:04 -0700 Subject: [PATCH] System property for disabling watchdoge @@ -18,5 +18,5 @@ index c8f619a7..06ad3826 100644 Logger log = Bukkit.getServer().getLogger(); log.log( Level.SEVERE, "The server has stopped responding!" ); -- -2.19.0 +2.51.0 diff --git a/patches/server/0091-Optimize-UserCache-Thread-Safe.patch b/patches/server/0090-Optimize-UserCache-Thread-Safe.patch similarity index 97% rename from patches/server/0091-Optimize-UserCache-Thread-Safe.patch rename to patches/server/0090-Optimize-UserCache-Thread-Safe.patch index 32becd4dd..d86184f14 100644 --- a/patches/server/0091-Optimize-UserCache-Thread-Safe.patch +++ b/patches/server/0090-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From ee86e4e88908c2178ad8e55a4c76fdc66802e0c5 Mon Sep 17 00:00:00 2001 +From bf098e02f11779bd0554ac78ad0294aefcef102f Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 13 Aug 2018 22:05:54 -0700 Subject: [PATCH] Optimize UserCache / Thread Safe @@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase the user never changed the default setting for Spigot's save on stop only. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b10845cd..c757cdc2 100644 +index bbca20fa..5a9d980b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -487,7 +487,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -101,5 +101,5 @@ index 0f82e06c..db95bc7a 100644 } -- -2.19.0 +2.51.0 diff --git a/patches/server/0092-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0091-Avoid-blocking-on-Network-Manager-creation.patch similarity index 97% rename from patches/server/0092-Avoid-blocking-on-Network-Manager-creation.patch rename to patches/server/0091-Avoid-blocking-on-Network-Manager-creation.patch index dbbdc8c22..9d379b468 100644 --- a/patches/server/0092-Avoid-blocking-on-Network-Manager-creation.patch +++ b/patches/server/0091-Avoid-blocking-on-Network-Manager-creation.patch @@ -1,4 +1,4 @@ -From 591e40f5851b448763a2477567cecf17a3e2d3f4 Mon Sep 17 00:00:00 2001 +From 7e207df66ae58439461a1033ac9b56b33eccb3c2 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 13 Aug 2018 22:08:12 -0700 Subject: [PATCH] Avoid blocking on Network Manager creation @@ -43,5 +43,5 @@ index eb223106..80369710 100644 if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 ) { -- -2.19.0 +2.51.0 diff --git a/patches/server/0093-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0092-Faster-redstone-torch-rapid-clock-removal.patch similarity index 96% rename from patches/server/0093-Faster-redstone-torch-rapid-clock-removal.patch rename to patches/server/0092-Faster-redstone-torch-rapid-clock-removal.patch index 6bbea2512..e75de4ed1 100644 --- a/patches/server/0093-Faster-redstone-torch-rapid-clock-removal.patch +++ b/patches/server/0092-Faster-redstone-torch-rapid-clock-removal.patch @@ -1,4 +1,4 @@ -From 5a34670d6fc165a8b1f49882dccc3eeb046bd283 Mon Sep 17 00:00:00 2001 +From fe8261c2dc6bf577d76d695182f7934497c094f0 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 13 Aug 2018 22:41:47 -0700 Subject: [PATCH] Faster redstone torch rapid clock removal @@ -39,5 +39,5 @@ index 78c6d195..b105b6a6 100644 public RedstoneUpdateInfo(BlockPosition blockposition, long i) { this.a = blockposition; -- -2.19.0 +2.51.0 diff --git a/patches/server/0094-Ensure-Chunks-never-ever-load-async.patch b/patches/server/0093-Ensure-Chunks-never-ever-load-async.patch similarity index 97% rename from patches/server/0094-Ensure-Chunks-never-ever-load-async.patch rename to patches/server/0093-Ensure-Chunks-never-ever-load-async.patch index 0090ccc5b..2d3b37a9c 100644 --- a/patches/server/0094-Ensure-Chunks-never-ever-load-async.patch +++ b/patches/server/0093-Ensure-Chunks-never-ever-load-async.patch @@ -1,4 +1,4 @@ -From 0a0c240c3f74fdfa77c102914436a122b01168b8 Mon Sep 17 00:00:00 2001 +From 68204fb792152636fb1e37d7076f7dac0ae15a37 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 13 Aug 2018 23:08:31 -0700 Subject: [PATCH] Ensure Chunks never ever load async @@ -50,5 +50,5 @@ index 1178ad7f..ef8e34cd 100644 return; } -- -2.19.0 +2.51.0 diff --git a/patches/server/0095-Add-server-name-parameter.patch b/patches/server/0094-Add-server-name-parameter.patch similarity index 92% rename from patches/server/0095-Add-server-name-parameter.patch rename to patches/server/0094-Add-server-name-parameter.patch index 49942186f..71959f5ad 100644 --- a/patches/server/0095-Add-server-name-parameter.patch +++ b/patches/server/0094-Add-server-name-parameter.patch @@ -1,4 +1,4 @@ -From 2fd0cfa530c788c0dbb0cb79339661f5c0d63f60 Mon Sep 17 00:00:00 2001 +From 9c76c9edfed764a2db24967a0c1450cd64b15087 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 13 Aug 2018 23:11:43 -0700 Subject: [PATCH] Add server-name parameter @@ -24,5 +24,5 @@ index c9362191..8a4a0d84 100644 }; -- -2.19.0 +2.51.0 diff --git a/patches/server/0096-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/server/0095-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch similarity index 97% rename from patches/server/0096-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch rename to patches/server/0095-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index 28dca665a..827665146 100644 --- a/patches/server/0096-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/patches/server/0095-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From bfe2ea99880afd7b479bbfe3abea3f2a386b2a26 Mon Sep 17 00:00:00 2001 +From c7b000db70f26501aed4be8a136ecf3e3ecaf970 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 13 Aug 2018 23:19:07 -0700 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world @@ -44,5 +44,5 @@ index fb19bad3..ef87df16 100644 double deltaZ = this.locZ - player.locZ; double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; -- -2.19.0 +2.51.0 diff --git a/patches/server/0097-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0096-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 93% rename from patches/server/0097-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to patches/server/0096-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index 72586891b..010623041 100644 --- a/patches/server/0097-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/patches/server/0096-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -1,4 +1,4 @@ -From caec140d832cef4fae4996ade3a65e207286af51 Mon Sep 17 00:00:00 2001 +From c3804a669f6a77d813a59de82e5fbd833bfe2272 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 00:13:24 -0700 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name @@ -18,5 +18,5 @@ index db95bc7a..c3bdb881 100644 GameProfile gameprofile = new GameProfile(uuid, s); -- -2.19.0 +2.51.0 diff --git a/patches/server/0098-Fix-AIOOBE-in-inventory-handling.patch b/patches/server/0097-Fix-AIOOBE-in-inventory-handling.patch similarity index 94% rename from patches/server/0098-Fix-AIOOBE-in-inventory-handling.patch rename to patches/server/0097-Fix-AIOOBE-in-inventory-handling.patch index 7ae011b76..33b05365c 100644 --- a/patches/server/0098-Fix-AIOOBE-in-inventory-handling.patch +++ b/patches/server/0097-Fix-AIOOBE-in-inventory-handling.patch @@ -1,4 +1,4 @@ -From 5a66643004b2b8ba1b0b132b80f6be98de4f18ab Mon Sep 17 00:00:00 2001 +From 3e44b88672bd8b53a788db8fb2d0a63e244a70bd Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 00:29:18 -0700 Subject: [PATCH] Fix AIOOBE in inventory handling @@ -18,5 +18,5 @@ index d23ff402..e9f9128f 100644 action = packetplayinwindowclick.c() == 0 ? InventoryAction.DROP_ALL_CURSOR : InventoryAction.DROP_ONE_CURSOR; } -- -2.19.0 +2.51.0 diff --git a/patches/server/0099-Auto-Save-Improvements.patch b/patches/server/0098-Auto-Save-Improvements.patch similarity index 99% rename from patches/server/0099-Auto-Save-Improvements.patch rename to patches/server/0098-Auto-Save-Improvements.patch index 9fefc3fde..40b46e5b9 100644 --- a/patches/server/0099-Auto-Save-Improvements.patch +++ b/patches/server/0098-Auto-Save-Improvements.patch @@ -1,4 +1,4 @@ -From 19eb9ab88853d5fa9801adf0275d05f59d61586a Mon Sep 17 00:00:00 2001 +From 6614dbf4c97721d2c22f2324eefa544e5ebea1cc Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 15:05:13 -0700 Subject: [PATCH] Auto Save Improvements @@ -55,7 +55,7 @@ index 8dc314de..e0e2b993 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 c757cdc2..6700ddcb 100644 +index 5a9d980b..7b397df3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -46,6 +46,7 @@ import joptsimple.OptionSet; @@ -233,5 +233,5 @@ index 912d2d5a..eef21847 100644 + } } -- -2.19.0 +2.51.0 diff --git a/patches/server/0100-Chunk-registration-fixes.patch b/patches/server/0099-Chunk-registration-fixes.patch similarity index 93% rename from patches/server/0100-Chunk-registration-fixes.patch rename to patches/server/0099-Chunk-registration-fixes.patch index 2afe00299..d35e9f4e5 100644 --- a/patches/server/0100-Chunk-registration-fixes.patch +++ b/patches/server/0099-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From bed71ab6b8a550b49698294080d283dda9671409 Mon Sep 17 00:00:00 2001 +From f414dc644efdeff79093b23d866db6cc8a44f3c5 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 15:08:12 -0700 Subject: [PATCH] Chunk registration fixes @@ -21,5 +21,5 @@ index 45c3e52b..bbc344b1 100644 if (!entity.ad || entity.ae != k || entity.af != l || entity.ag != i1) { -- -2.19.0 +2.51.0 diff --git a/patches/server/0101-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/patches/server/0100-Remove-FishingHook-reference-on-Craft-Entity-removal.patch similarity index 92% rename from patches/server/0101-Remove-FishingHook-reference-on-Craft-Entity-removal.patch rename to patches/server/0100-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index 8018e69b7..a93143461 100644 --- a/patches/server/0101-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/patches/server/0100-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -1,4 +1,4 @@ -From 25954f3bf792d35eac95cdf07546f724c98c8a1d Mon Sep 17 00:00:00 2001 +From 7acccca21151b9800e71fe742561a66bc88fbb37 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 15:09:45 -0700 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal @@ -26,5 +26,5 @@ index ecfc316b..3f909c17 100644 public LivingEntity _INVALID_getShooter() { return (LivingEntity) getShooter(); -- -2.19.0 +2.51.0 diff --git a/patches/server/0102-Auto-fix-bad-Y-levels-on-player-login.patch b/patches/server/0101-Auto-fix-bad-Y-levels-on-player-login.patch similarity index 93% rename from patches/server/0102-Auto-fix-bad-Y-levels-on-player-login.patch rename to patches/server/0101-Auto-fix-bad-Y-levels-on-player-login.patch index 1b021072c..53cd429e7 100644 --- a/patches/server/0102-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/patches/server/0101-Auto-fix-bad-Y-levels-on-player-login.patch @@ -1,4 +1,4 @@ -From 2704c7729fc60e5342b58dbddb38c239bf187483 Mon Sep 17 00:00:00 2001 +From 6c1d580f7a7db07340e4e598480291b674df9dbb Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 15:10:52 -0700 Subject: [PATCH] Auto fix bad Y levels on player login @@ -18,5 +18,5 @@ index e0e2b993..09b07f7c 100644 if (MinecraftServer.getServer().getForceGamemode()) { this.playerInteractManager.setGameMode(MinecraftServer.getServer().getGamemode()); -- -2.19.0 +2.51.0 diff --git a/patches/server/0103-Disable-Vanilla-Chunk-GC.patch b/patches/server/0102-Disable-Vanilla-Chunk-GC.patch similarity index 94% rename from patches/server/0103-Disable-Vanilla-Chunk-GC.patch rename to patches/server/0102-Disable-Vanilla-Chunk-GC.patch index 909a9e881..0edf1e074 100644 --- a/patches/server/0103-Disable-Vanilla-Chunk-GC.patch +++ b/patches/server/0102-Disable-Vanilla-Chunk-GC.patch @@ -1,4 +1,4 @@ -From 92383373446c0959f48972b915982ba2c466b5fd Mon Sep 17 00:00:00 2001 +From 91516ff7a00c3b13612c7a0610ee05567f6d2281 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 15:16:09 -0700 Subject: [PATCH] Disable Vanilla Chunk GC @@ -27,5 +27,5 @@ index 665d97d4..e8cdce2a 100644 } } -- -2.19.0 +2.51.0 diff --git a/patches/server/0104-Option-to-remove-corrupt-tile-entities.patch b/patches/server/0103-Option-to-remove-corrupt-tile-entities.patch similarity index 96% rename from patches/server/0104-Option-to-remove-corrupt-tile-entities.patch rename to patches/server/0103-Option-to-remove-corrupt-tile-entities.patch index 909bb1876..3347a37c7 100644 --- a/patches/server/0104-Option-to-remove-corrupt-tile-entities.patch +++ b/patches/server/0103-Option-to-remove-corrupt-tile-entities.patch @@ -1,4 +1,4 @@ -From b1f82888a0dffceeb7e17c005ff83f713246c33a Mon Sep 17 00:00:00 2001 +From 768ea3cd8a2af5c3d60eb1b94736829e73a39848 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 15:21:57 -0700 Subject: [PATCH] Option to remove corrupt tile entities @@ -52,5 +52,5 @@ index eef21847..a643db9b 100644 + } } -- -2.19.0 +2.51.0 diff --git a/patches/server/0105-Add-EntityZapEvent.patch b/patches/server/0104-Add-EntityZapEvent.patch similarity index 97% rename from patches/server/0105-Add-EntityZapEvent.patch rename to patches/server/0104-Add-EntityZapEvent.patch index a60add9e4..d12b0be70 100644 --- a/patches/server/0105-Add-EntityZapEvent.patch +++ b/patches/server/0104-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 53219d008e1b02524601d823317deb303e4afd9e Mon Sep 17 00:00:00 2001 +From ba3c7c6facfe86bafdc903b726caed29d0090125 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 15:46:13 -0700 Subject: [PATCH] Add EntityZapEvent @@ -65,5 +65,5 @@ index e0300247..7d97dd1b 100644 HorseJumpEvent event = new HorseJumpEvent((Horse) horse.getBukkitEntity(), power); horse.getBukkitEntity().getServer().getPluginManager().callEvent(event); -- -2.19.0 +2.51.0 diff --git a/patches/server/0106-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0105-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 95% rename from patches/server/0106-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0105-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index 212bd4165..32dc5d6e1 100644 --- a/patches/server/0106-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/patches/server/0105-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -1,4 +1,4 @@ -From 593a32279f0ea063846267f70a3aefe62d0e01fb Mon Sep 17 00:00:00 2001 +From 6a8fd12127a12062e1df9864fa33b7cfe81f40e6 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 15:52:44 -0700 Subject: [PATCH] Don't load Chunks from Hoppers and other things @@ -32,5 +32,5 @@ index eed516e2..26160dbe 100644 if (block == this) { if (this.n(world, blockposition1)) { -- -2.19.0 +2.51.0 diff --git a/patches/server/0107-Cache-user-authenticator-threads.patch b/patches/server/0106-Cache-user-authenticator-threads.patch similarity index 96% rename from patches/server/0107-Cache-user-authenticator-threads.patch rename to patches/server/0106-Cache-user-authenticator-threads.patch index 756f3b982..41a63e12a 100644 --- a/patches/server/0107-Cache-user-authenticator-threads.patch +++ b/patches/server/0106-Cache-user-authenticator-threads.patch @@ -1,4 +1,4 @@ -From 0a45d3389de17b85389bd8163f3171d9353f1f06 Mon Sep 17 00:00:00 2001 +From b0380dce9da4bf9f9c6a4bc145852fb97a6fd609 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 16:58:19 -0700 Subject: [PATCH] Cache user authenticator threads @@ -42,5 +42,5 @@ index 541cec7c..1a1ace9e 100644 } -- -2.19.0 +2.51.0 diff --git a/patches/server/0108-Optimize-Network-Queue.patch b/patches/server/0107-Optimize-Network-Queue.patch similarity index 92% rename from patches/server/0108-Optimize-Network-Queue.patch rename to patches/server/0107-Optimize-Network-Queue.patch index 0e8b07fce..a5760b61b 100644 --- a/patches/server/0108-Optimize-Network-Queue.patch +++ b/patches/server/0107-Optimize-Network-Queue.patch @@ -1,11 +1,11 @@ -From 55a2576aee0039ba9cdc4c3d67a59cbdcd051f0e Mon Sep 17 00:00:00 2001 +From 5b9311b1830e9185cafc9739f57667e86bbe0263 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 16:59:49 -0700 Subject: [PATCH] Optimize Network Queue diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6700ddcb..245e9735 100644 +index 7b397df3..1edae2a7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -47,6 +47,7 @@ import joptsimple.OptionSet; @@ -26,5 +26,5 @@ index 6700ddcb..245e9735 100644 private long ab = az(); -- -2.19.0 +2.51.0 diff --git a/patches/server/0109-Optimise-removeQueue.patch b/patches/server/0108-Optimise-removeQueue.patch similarity index 97% rename from patches/server/0109-Optimise-removeQueue.patch rename to patches/server/0108-Optimise-removeQueue.patch index a2f895073..d9e97a206 100644 --- a/patches/server/0109-Optimise-removeQueue.patch +++ b/patches/server/0108-Optimise-removeQueue.patch @@ -1,4 +1,4 @@ -From 01a1a119d7620e7370497ac5dbd02cfe43428479 Mon Sep 17 00:00:00 2001 +From c018e6ce8cb8cda2ca1920e855e7aa52e0acb402 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 20:28:45 -0700 Subject: [PATCH] Optimise removeQueue @@ -59,5 +59,5 @@ index 09b07f7c..2ec19bfb 100644 protected void a(MobEffect mobeffect) { -- -2.19.0 +2.51.0 diff --git a/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0109-Add-source-to-PlayerExpChangeEvent.patch similarity index 97% rename from patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch rename to patches/server/0109-Add-source-to-PlayerExpChangeEvent.patch index c77d6d706..32c72eac3 100644 --- a/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch +++ b/patches/server/0109-Add-source-to-PlayerExpChangeEvent.patch @@ -1,4 +1,4 @@ -From 0e59df3199f70db481f8d22b4a4a94b5ae4b8967 Mon Sep 17 00:00:00 2001 +From c9251d018c1b58a711bcea4cd3118c4165a73c67 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 20:42:07 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent @@ -48,5 +48,5 @@ index 7d97dd1b..a23dc558 100644 Block block = world.getWorld().getBlockAt(x, y, z); CraftBlockState state = (CraftBlockState) block.getState(); -- -2.19.0 +2.51.0 diff --git a/patches/server/0111-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0110-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 92% rename from patches/server/0111-Optimize-World.isLoaded-BlockPosition-Z.patch rename to patches/server/0110-Optimize-World.isLoaded-BlockPosition-Z.patch index e9ccb28d0..9919ca147 100644 --- a/patches/server/0111-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/patches/server/0110-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -1,4 +1,4 @@ -From 6c409bf945d46601795b2cbd35370a69dc318d20 Mon Sep 17 00:00:00 2001 +From 90ce93cc7b2a65e922726bf2a0e5b668910b31e4 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 21:05:50 -0700 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z @@ -19,5 +19,5 @@ index bbc344b1..6e0ab356 100644 public boolean a(BlockPosition blockposition, boolean flag) { -- -2.19.0 +2.51.0 diff --git a/patches/server/0112-Don-t-let-fishinghooks-use-portals.patch b/patches/server/0111-Don-t-let-fishinghooks-use-portals.patch similarity index 95% rename from patches/server/0112-Don-t-let-fishinghooks-use-portals.patch rename to patches/server/0111-Don-t-let-fishinghooks-use-portals.patch index 43ff71e4f..080690602 100644 --- a/patches/server/0112-Don-t-let-fishinghooks-use-portals.patch +++ b/patches/server/0111-Don-t-let-fishinghooks-use-portals.patch @@ -1,4 +1,4 @@ -From 4a0e2fae8e56d0edb2d8ea59c7b3dc81d75bffdf Mon Sep 17 00:00:00 2001 +From e40a828f178e6ec3d685e02059cb5f49dccf1882 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 21:53:51 -0700 Subject: [PATCH] Don't let fishinghooks use portals @@ -35,5 +35,5 @@ index df6ce0db..6ff95184 100644 } } -- -2.19.0 +2.51.0 diff --git a/patches/server/0113-Add-ProjectileCollideEvent.patch b/patches/server/0112-Add-ProjectileCollideEvent.patch similarity index 99% rename from patches/server/0113-Add-ProjectileCollideEvent.patch rename to patches/server/0112-Add-ProjectileCollideEvent.patch index 66d9f0ee4..d53b55127 100644 --- a/patches/server/0113-Add-ProjectileCollideEvent.patch +++ b/patches/server/0112-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From a5bcd09531f16cb709c65495049ffe33dc6022ff Mon Sep 17 00:00:00 2001 +From 45a0b561bc4fb0683572985257dd615332c996b8 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 22:24:41 -0700 Subject: [PATCH] Add ProjectileCollideEvent @@ -150,5 +150,5 @@ index a23dc558..eb28b261 100644 Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); -- -2.19.0 +2.51.0 diff --git a/patches/server/0114-Vanished-players-don-t-have-rights.patch b/patches/server/0113-Vanished-players-don-t-have-rights.patch similarity index 98% rename from patches/server/0114-Vanished-players-don-t-have-rights.patch rename to patches/server/0113-Vanished-players-don-t-have-rights.patch index 471c6c5ba..aeadc046a 100644 --- a/patches/server/0114-Vanished-players-don-t-have-rights.patch +++ b/patches/server/0113-Vanished-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From 5517ffdb373cabaaff505daffd9e75bb48b81087 Mon Sep 17 00:00:00 2001 +From 038ae1918ebee135be8f01cf2b4bdf1d4d767ccf Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 22:49:09 -0700 Subject: [PATCH] Vanished players don't have rights @@ -92,5 +92,5 @@ index eb28b261..6ad5f492 100644 return event; } -- -2.19.0 +2.51.0 diff --git a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0114-Prevent-Pathfinding-out-of-World-Border.patch similarity index 96% rename from patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch rename to patches/server/0114-Prevent-Pathfinding-out-of-World-Border.patch index 411a34387..6f3656622 100644 --- a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch +++ b/patches/server/0114-Prevent-Pathfinding-out-of-World-Border.patch @@ -1,4 +1,4 @@ -From 31bec1092b16ea55400a022da6aeba0bef216640 Mon Sep 17 00:00:00 2001 +From 5bf8fd5ba2519dd94e00110dfebabbecd4f7655e Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 23:08:11 -0700 Subject: [PATCH] Prevent Pathfinding out of World Border @@ -38,5 +38,5 @@ index 7ea40468..b1fbcd1b 100644 return (double) (blockposition.getX() + 1) > this.b() && (double) blockposition.getX() < this.d() && (double) (blockposition.getZ() + 1) > this.c() && (double) blockposition.getZ() < this.e(); } -- -2.19.0 +2.51.0 diff --git a/patches/server/0116-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0115-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 96% rename from patches/server/0116-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/server/0115-Add-API-methods-to-control-if-armour-stands-can-move.patch index 259a189e3..89c0c490e 100644 --- a/patches/server/0116-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/patches/server/0115-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,4 +1,4 @@ -From fe07db3c1b34db27dd049288a8c42edb432349b6 Mon Sep 17 00:00:00 2001 +From d6e317f22da36a7cac8c006d253cf3727c45f63d Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 23:33:53 -0700 Subject: [PATCH] Add API methods to control if armour stands can move @@ -50,5 +50,5 @@ index 09443fe1..097a8784 100644 + } } -- -2.19.0 +2.51.0 diff --git a/patches/server/0117-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0116-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 95% rename from patches/server/0117-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0116-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index af05d6c6c..30409db82 100644 --- a/patches/server/0117-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/patches/server/0116-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,4 +1,4 @@ -From 69a21c4b6c19c8dd10b722871a3d8660b0dd0fe8 Mon Sep 17 00:00:00 2001 +From 2d22d7054cf6402c0ce3ba92564402a79b785b4b Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 23:41:06 -0700 Subject: [PATCH] Option to prevent armor stands from doing entity lookups @@ -31,5 +31,5 @@ index a643db9b..abfa8a71 100644 + } } -- -2.19.0 +2.51.0 diff --git a/patches/server/0118-IllegalPacketEvent.patch b/patches/server/0117-IllegalPacketEvent.patch similarity index 97% rename from patches/server/0118-IllegalPacketEvent.patch rename to patches/server/0117-IllegalPacketEvent.patch index d1f7c0550..1e4d58c9e 100644 --- a/patches/server/0118-IllegalPacketEvent.patch +++ b/patches/server/0117-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From 62dfb8b0036386bc3af45fbc73b29a0f91979696 Mon Sep 17 00:00:00 2001 +From aa2672a7f9e3ed0ad641f5debb7228bc99101c80 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 14 Aug 2018 23:50:44 -0700 Subject: [PATCH] IllegalPacketEvent @@ -58,5 +58,5 @@ index e9f9128f..05bf38b6 100644 } } else if ("MC|ItemName".equals(packetplayincustompayload.a()) && this.player.activeContainer instanceof ContainerAnvil) { -- -2.19.0 +2.51.0 diff --git a/patches/server/0119-String-based-Action-Bar-API.patch b/patches/server/0118-String-based-Action-Bar-API.patch similarity index 97% rename from patches/server/0119-String-based-Action-Bar-API.patch rename to patches/server/0118-String-based-Action-Bar-API.patch index b43683040..f302cdb41 100644 --- a/patches/server/0119-String-based-Action-Bar-API.patch +++ b/patches/server/0118-String-based-Action-Bar-API.patch @@ -1,4 +1,4 @@ -From 5b09f2963d90ed76896698d629263f6af057c802 Mon Sep 17 00:00:00 2001 +From 21bd46b2e516be98887ea0a67dadd72dace11747 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Thu, 16 Aug 2018 15:27:59 -0700 Subject: [PATCH] String based Action Bar API @@ -63,7 +63,7 @@ index aefc829b..7f86691a 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index dc4e343d..712f18fe 100644 +index 8aba4665..ccb5377d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -193,6 +193,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -91,5 +91,5 @@ index dc4e343d..712f18fe 100644 public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) { PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(); -- -2.19.0 +2.51.0 diff --git a/patches/server/0120-Firework-API-s.patch b/patches/server/0119-Firework-API-s.patch similarity index 97% rename from patches/server/0120-Firework-API-s.patch rename to patches/server/0119-Firework-API-s.patch index a7ffcc7bd..55b83a4e5 100644 --- a/patches/server/0120-Firework-API-s.patch +++ b/patches/server/0119-Firework-API-s.patch @@ -1,4 +1,4 @@ -From 3fae1ec2fda14a0212c2bf50eb1ff8784ddc6dab Mon Sep 17 00:00:00 2001 +From 0d90cadc018efdabdef0d49ea53934f04ba426af Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Thu, 16 Aug 2018 17:34:14 -0700 Subject: [PATCH] Firework API's @@ -70,5 +70,5 @@ index 76a9bdba..5f1c3332 100644 + } } -- -2.19.0 +2.51.0 diff --git a/patches/server/0121-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0120-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 95% rename from patches/server/0121-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/server/0120-Provide-E-TE-Chunk-count-stat-methods.patch index f06e05514..4d8809830 100644 --- a/patches/server/0121-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/patches/server/0120-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From b50d8bff8f23bf45cc6acb316ee12e83c87d3269 Mon Sep 17 00:00:00 2001 +From 747e77bc9b36ba978bcee5745964c377ae10bba2 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 17 Aug 2018 16:32:28 -0700 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -38,5 +38,5 @@ index 9549a763..62ee2a85 100644 public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { -- -2.19.0 +2.51.0 diff --git a/patches/server/0122-Enforce-Sync-Player-Saves.patch b/patches/server/0121-Enforce-Sync-Player-Saves.patch similarity index 93% rename from patches/server/0122-Enforce-Sync-Player-Saves.patch rename to patches/server/0121-Enforce-Sync-Player-Saves.patch index 8e002d9c8..72691ed27 100644 --- a/patches/server/0122-Enforce-Sync-Player-Saves.patch +++ b/patches/server/0121-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From 0f0407b9e657b99dc8fd1a39809f8c41966ead9c Mon Sep 17 00:00:00 2001 +From e9ccd325903da5f1e43edf7d9a1ec84e576df85f Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 17 Aug 2018 20:31:29 -0700 Subject: [PATCH] Enforce Sync Player Saves @@ -27,5 +27,5 @@ index 33fd76a4..6ee82db5 100644 // Paper end -- -2.19.0 +2.51.0 diff --git a/patches/server/0123-Fix-block-break-desync.patch b/patches/server/0122-Fix-block-break-desync.patch similarity index 93% rename from patches/server/0123-Fix-block-break-desync.patch rename to patches/server/0122-Fix-block-break-desync.patch index 2d4ef1387..ec4efd283 100644 --- a/patches/server/0123-Fix-block-break-desync.patch +++ b/patches/server/0122-Fix-block-break-desync.patch @@ -1,4 +1,4 @@ -From 1642cd9805e4ca8170b3523f87c6b6df76579254 Mon Sep 17 00:00:00 2001 +From feaff5478a836fac63b66030fc8424cdffd349c6 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 17 Aug 2018 20:38:34 -0700 Subject: [PATCH] Fix block break desync @@ -18,5 +18,5 @@ index 05bf38b6..4baf692b 100644 } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) { return; -- -2.19.0 +2.51.0 diff --git a/patches/server/0124-Shame-on-you-Mojang.patch b/patches/server/0123-Shame-on-you-Mojang.patch similarity index 96% rename from patches/server/0124-Shame-on-you-Mojang.patch rename to patches/server/0123-Shame-on-you-Mojang.patch index c346f96fd..2df424e6b 100644 --- a/patches/server/0124-Shame-on-you-Mojang.patch +++ b/patches/server/0123-Shame-on-you-Mojang.patch @@ -1,4 +1,4 @@ -From f1b6a465261df3568efdcbaeadb77f9a0b8d4b8b Mon Sep 17 00:00:00 2001 +From 15df8f675ea1973e2dccf5f587ff165fe7d9b163 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 17 Aug 2018 20:57:00 -0700 Subject: [PATCH] Shame on you Mojang @@ -55,5 +55,5 @@ index a73d7b13..01565641 100644 } } -- -2.19.0 +2.51.0 diff --git a/patches/server/0125-Item-canEntityPickup.patch b/patches/server/0124-Item-canEntityPickup.patch similarity index 96% rename from patches/server/0125-Item-canEntityPickup.patch rename to patches/server/0124-Item-canEntityPickup.patch index 0814b694a..8d65e6cb8 100644 --- a/patches/server/0125-Item-canEntityPickup.patch +++ b/patches/server/0124-Item-canEntityPickup.patch @@ -1,4 +1,4 @@ -From 90ab0948d76c23289895ea01136ea2b341ac3e3e Mon Sep 17 00:00:00 2001 +From 81d7fe6c6ca2814a7e9ceb75f70d15e55a33f247 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 17 Aug 2018 21:13:26 -0700 Subject: [PATCH] Item#canEntityPickup @@ -55,5 +55,5 @@ index a17a537d..1df17f09 100644 public String toString() { return "CraftItem"; -- -2.19.0 +2.51.0 diff --git a/patches/server/0126-Block-player-logins-during-server-shutdown.patch b/patches/server/0125-Block-player-logins-during-server-shutdown.patch similarity index 93% rename from patches/server/0126-Block-player-logins-during-server-shutdown.patch rename to patches/server/0125-Block-player-logins-during-server-shutdown.patch index e1bc72da0..00e57dfa7 100644 --- a/patches/server/0126-Block-player-logins-during-server-shutdown.patch +++ b/patches/server/0125-Block-player-logins-during-server-shutdown.patch @@ -1,4 +1,4 @@ -From 621e900eba5c4228b08aa1720892db36cacbc667 Mon Sep 17 00:00:00 2001 +From ea1435319ef970315e75f95ffff4a56d1f6840a3 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 17 Aug 2018 21:52:22 -0700 Subject: [PATCH] Block player logins during server shutdown @@ -22,5 +22,5 @@ index 1a1ace9e..2fc69519 100644 this.b(); } else if (this.g == LoginListener.EnumProtocolState.e) { -- -2.19.0 +2.51.0 diff --git a/patches/server/0127-Add-PlayerJumpEvent.patch b/patches/server/0126-Add-PlayerJumpEvent.patch similarity index 97% rename from patches/server/0127-Add-PlayerJumpEvent.patch rename to patches/server/0126-Add-PlayerJumpEvent.patch index 5d655e084..1451e252e 100644 --- a/patches/server/0127-Add-PlayerJumpEvent.patch +++ b/patches/server/0126-Add-PlayerJumpEvent.patch @@ -1,4 +1,4 @@ -From fbeb24ca58abdc99769109c2d18df03a881f98ed Mon Sep 17 00:00:00 2001 +From 6ecf36b5598e05d9fbe2c711656f138b327099dd Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 17 Aug 2018 22:58:04 -0700 Subject: [PATCH] Add PlayerJumpEvent @@ -48,5 +48,5 @@ index 4baf692b..e25543ac 100644 this.player.move(d11, d12, d13); -- -2.19.0 +2.51.0 diff --git a/patches/server/0128-Add-ProtocolVersion-API.patch b/patches/server/0127-Add-ProtocolVersion-API.patch similarity index 97% rename from patches/server/0128-Add-ProtocolVersion-API.patch rename to patches/server/0127-Add-ProtocolVersion-API.patch index 99446865b..4e8f3c258 100644 --- a/patches/server/0128-Add-ProtocolVersion-API.patch +++ b/patches/server/0127-Add-ProtocolVersion-API.patch @@ -1,4 +1,4 @@ -From d4160cf2195181a73288a7ca9517178d1385aed4 Mon Sep 17 00:00:00 2001 +From 3f413ce87aa60550ccb0f9b9a8f32ceb861095e7 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 17 Aug 2018 23:30:04 -0700 Subject: [PATCH] Add ProtocolVersion API @@ -54,7 +54,7 @@ index 6ee82db5..9f103901 100644 PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.networkManager.getRawAddress()).getAddress()); String s; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 712f18fe..b85669b8 100644 +index ccb5377d..65ed6db3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1822,6 +1822,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -70,5 +70,5 @@ index 712f18fe..b85669b8 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.19.0 +2.51.0 diff --git a/patches/server/0129-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch b/patches/server/0128-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch similarity index 95% rename from patches/server/0129-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch rename to patches/server/0128-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch index eff5f9865..8c0bca7ec 100644 --- a/patches/server/0129-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch +++ b/patches/server/0128-Replace-HashSet-with-fastutil-s-ObjectOpenHashSet-in.patch @@ -1,4 +1,4 @@ -From 4bc147850a11ee881c4ed2cd25ecf50bb7593272 Mon Sep 17 00:00:00 2001 +From ae85337d6afd2c33c79f4ab15e4fca498b353688 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 18 Aug 2018 12:16:11 -0700 Subject: [PATCH] Replace HashSet with fastutil's ObjectOpenHashSet in @@ -26,5 +26,5 @@ index 80a5c29f..cd864c40 100644 public HashTreeSet() { -- -2.19.0 +2.51.0 diff --git a/patches/server/0130-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0129-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 93% rename from patches/server/0130-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/server/0129-Prevent-logins-from-being-processed-when-the-player-.patch index dd30a1134..b9b937d97 100644 --- a/patches/server/0130-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/patches/server/0129-Prevent-logins-from-being-processed-when-the-player-.patch @@ -1,4 +1,4 @@ -From d30568c098a13b76f89a6fc7ae7c4429dea65a39 Mon Sep 17 00:00:00 2001 +From 51193708803a2275f957a1f3ebcb931fee78954f Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 18 Aug 2018 14:46:11 -0700 Subject: [PATCH] Prevent logins from being processed when the player has @@ -23,5 +23,5 @@ index 2fc69519..4cb90b23 100644 EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId()); -- -2.19.0 +2.51.0 diff --git a/patches/server/0131-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0130-use-CB-BlockState-implementations-for-captured-block.patch similarity index 96% rename from patches/server/0131-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/server/0130-use-CB-BlockState-implementations-for-captured-block.patch index 6d8218980..96b8ffd9d 100644 --- a/patches/server/0131-use-CB-BlockState-implementations-for-captured-block.patch +++ b/patches/server/0130-use-CB-BlockState-implementations-for-captured-block.patch @@ -1,4 +1,4 @@ -From 22309615fcddf1ef4f777e93352e7da89d78d30b Mon Sep 17 00:00:00 2001 +From d3ba5a52db328b9813ce1bf2b4f87d44471e4253 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 18 Aug 2018 14:50:26 -0700 Subject: [PATCH] use CB BlockState implementations for captured blocks @@ -31,5 +31,5 @@ index 6cc64401..07427860 100644 } // CraftBukkit end -- -2.19.0 +2.51.0 diff --git a/patches/server/0132-PreCreatureSpawnEvent.patch b/patches/server/0131-PreCreatureSpawnEvent.patch similarity index 98% rename from patches/server/0132-PreCreatureSpawnEvent.patch rename to patches/server/0131-PreCreatureSpawnEvent.patch index 687e3e87d..6189e9bfd 100644 --- a/patches/server/0132-PreCreatureSpawnEvent.patch +++ b/patches/server/0131-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From c7fbd0e1002b3471a5405a2535f6f775c928b558 Mon Sep 17 00:00:00 2001 +From 0be080268c3239ec7060c7df326f1f82058148b7 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 20 Aug 2018 23:51:01 -0700 Subject: [PATCH] PreCreatureSpawnEvent @@ -15,7 +15,7 @@ instead and save a lot of server resources. See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index d4674dcd..c7e6c6f6 100644 +index e54f7edb..c2a731f0 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -6,8 +6,10 @@ import java.util.List; @@ -100,5 +100,5 @@ index a12ae12d..d840c181 100644 try { -- -2.19.0 +2.51.0 diff --git a/patches/server/0133-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0132-PlayerNaturallySpawnCreaturesEvent.patch similarity index 96% rename from patches/server/0133-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/server/0132-PlayerNaturallySpawnCreaturesEvent.patch index dbae90713..5dcfea924 100644 --- a/patches/server/0133-PlayerNaturallySpawnCreaturesEvent.patch +++ b/patches/server/0132-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From 22e0afabe22bcb0ddb21f29f2fd013ecd859ef0c Mon Sep 17 00:00:00 2001 +From 529a2855c802d46b7f235040fb6c249c23d8aad4 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 20 Aug 2018 23:59:59 -0700 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -35,5 +35,5 @@ index d840c181..0e447613 100644 for (int i1 = -b0; i1 <= b0; ++i1) { -- -2.19.0 +2.51.0 diff --git a/patches/server/0134-Improved-Async-Task-Scheduler.patch b/patches/server/0133-Improved-Async-Task-Scheduler.patch similarity index 99% rename from patches/server/0134-Improved-Async-Task-Scheduler.patch rename to patches/server/0133-Improved-Async-Task-Scheduler.patch index 6de339914..1c576b179 100644 --- a/patches/server/0134-Improved-Async-Task-Scheduler.patch +++ b/patches/server/0133-Improved-Async-Task-Scheduler.patch @@ -1,4 +1,4 @@ -From 66e4a2e2fee71ee759ab0d2a2d9f69a5de4ef608 Mon Sep 17 00:00:00 2001 +From 7d3c4406258626844475b79b04678df675a0aa9e Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 01:56:21 -0700 Subject: [PATCH] Improved Async Task Scheduler @@ -380,5 +380,5 @@ index 4b1e3523..44cbcdac 100644 * -1 means no repeating
* -2 means cancel
-- -2.20.1 +2.51.0 diff --git a/patches/server/0135-Make-player-data-saving-configurable.patch b/patches/server/0134-Make-player-data-saving-configurable.patch similarity index 96% rename from patches/server/0135-Make-player-data-saving-configurable.patch rename to patches/server/0134-Make-player-data-saving-configurable.patch index 1aec9afce..e42b601c7 100644 --- a/patches/server/0135-Make-player-data-saving-configurable.patch +++ b/patches/server/0134-Make-player-data-saving-configurable.patch @@ -1,4 +1,4 @@ -From 2947aabfe88cbbb3eb1c0b5efc184090d4fcfef4 Mon Sep 17 00:00:00 2001 +From a4c3275d018cafdc107c9695b0c3fc2291df5da3 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 01:58:57 -0700 Subject: [PATCH] Make player data saving configurable @@ -45,5 +45,5 @@ index fa1414bc..ebb6e479 100644 public static double weaknessEffectModifier; private static void effectModifiers() -- -2.19.0 +2.51.0 diff --git a/patches/server/0136-Add-method-to-open-already-placed-sign.patch b/patches/server/0135-Add-method-to-open-already-placed-sign.patch similarity index 94% rename from patches/server/0136-Add-method-to-open-already-placed-sign.patch rename to patches/server/0135-Add-method-to-open-already-placed-sign.patch index ca97f2b0a..e84280c87 100644 --- a/patches/server/0136-Add-method-to-open-already-placed-sign.patch +++ b/patches/server/0135-Add-method-to-open-already-placed-sign.patch @@ -1,4 +1,4 @@ -From c8b128f205c29dc22b09b590ef065d3e3f14a844 Mon Sep 17 00:00:00 2001 +From fa4051bf3bccb5e6c9914df147b2a2ba278c8b43 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 02:02:25 -0700 Subject: [PATCH] Add method to open already placed sign @@ -27,5 +27,5 @@ index 4e5db758..a12806d4 100644 + // Paper end } -- -2.19.0 +2.51.0 diff --git a/patches/server/0137-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0136-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 94% rename from patches/server/0137-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/server/0136-Allow-spawning-Item-entities-with-World.spawnEntity.patch index 03cbca4cf..2a0b642aa 100644 --- a/patches/server/0137-Allow-spawning-Item-entities-with-World.spawnEntity.patch +++ b/patches/server/0136-Allow-spawning-Item-entities-with-World.spawnEntity.patch @@ -1,4 +1,4 @@ -From 3096e143f107c46f5eb965d7cb597af16d7b2e5f Mon Sep 17 00:00:00 2001 +From 9b7915469a56338cff0e2505e3c65ad75ad0012c Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 02:33:09 -0700 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity @@ -23,5 +23,5 @@ index 62ee2a85..2ba3c7e0 100644 x = location.getBlockX(); y = location.getBlockY(); -- -2.19.0 +2.51.0 diff --git a/patches/server/0138-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0137-Implement-EntityKnockbackByEntityEvent.patch similarity index 96% rename from patches/server/0138-Implement-EntityKnockbackByEntityEvent.patch rename to patches/server/0137-Implement-EntityKnockbackByEntityEvent.patch index 4b22f9cac..8420c286d 100644 --- a/patches/server/0138-Implement-EntityKnockbackByEntityEvent.patch +++ b/patches/server/0137-Implement-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From 92edb63af131d8a78ef181868e19c9d698e034c2 Mon Sep 17 00:00:00 2001 +From 007d13f1a98f9d21cdb641243972bd989a986313 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 02:52:27 -0700 Subject: [PATCH] Implement EntityKnockbackByEntityEvent @@ -52,5 +52,5 @@ index 07473528..bac67bb6 100644 } -- -2.19.0 +2.51.0 diff --git a/patches/server/0139-Expand-Explosions-API.patch b/patches/server/0138-Expand-Explosions-API.patch similarity index 94% rename from patches/server/0139-Expand-Explosions-API.patch rename to patches/server/0138-Expand-Explosions-API.patch index 41b3fe8da..5f3d8f9e8 100644 --- a/patches/server/0139-Expand-Explosions-API.patch +++ b/patches/server/0138-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From e681b6323c0772fc82e5351cf382f2e2c5363e58 Mon Sep 17 00:00:00 2001 +From b752de3cf1c45a3767474c669aa5913166473ea5 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 13:49:18 -0700 Subject: [PATCH] Expand Explosions API @@ -23,5 +23,5 @@ index 2ba3c7e0..e7cb442b 100644 return createExplosion(loc, power, false); } -- -2.19.0 +2.51.0 diff --git a/patches/server/0140-Entity-getChunk-API.patch b/patches/server/0139-Entity-getChunk-API.patch similarity index 93% rename from patches/server/0140-Entity-getChunk-API.patch rename to patches/server/0139-Entity-getChunk-API.patch index 024381e58..524277c9d 100644 --- a/patches/server/0140-Entity-getChunk-API.patch +++ b/patches/server/0139-Entity-getChunk-API.patch @@ -1,4 +1,4 @@ -From 0e758a51eacbcbe1fa9bb89d6f3274632fb16764 Mon Sep 17 00:00:00 2001 +From 893629df6bee5e38f1ae1be1777de504c0c8634f Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 14:22:46 -0700 Subject: [PATCH] Entity#getChunk API @@ -30,5 +30,5 @@ index b60e2ff0..2c1b591a 100644 /** * Order is *EXTREMELY* important -- keep it right! =D -- -2.19.0 +2.51.0 diff --git a/patches/server/0141-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0140-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 98% rename from patches/server/0141-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/0140-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 5042ae198..37933a694 100644 --- a/patches/server/0141-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/patches/server/0140-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -1,4 +1,4 @@ -From 32e02e5573ba5f86997d6b485bf21c2d87e98151 Mon Sep 17 00:00:00 2001 +From 96072c8b27024d713ff6cfb44cf7e5ba1fdd4f73 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 16:08:41 -0700 Subject: [PATCH] Refresh player inventory when cancelling @@ -64,5 +64,5 @@ index e25543ac..97394ed5 100644 } // CraftBukkit end -- -2.19.0 +2.51.0 diff --git a/patches/server/0142-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/0141-Avoid-item-merge-if-stack-size-above-max-stack-size.patch similarity index 93% rename from patches/server/0142-Avoid-item-merge-if-stack-size-above-max-stack-size.patch rename to patches/server/0141-Avoid-item-merge-if-stack-size-above-max-stack-size.patch index 8ffa65a3c..89c40d098 100644 --- a/patches/server/0142-Avoid-item-merge-if-stack-size-above-max-stack-size.patch +++ b/patches/server/0141-Avoid-item-merge-if-stack-size-above-max-stack-size.patch @@ -1,4 +1,4 @@ -From e42629735eda725d237fb3cfe0d7ff43a0071864 Mon Sep 17 00:00:00 2001 +From 3a17c9f479e1f231f585a639aee4f2cabc4302ac Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 16:10:45 -0700 Subject: [PATCH] Avoid item merge if stack size above max stack size @@ -20,5 +20,5 @@ index 789d5833..c0e756c6 100644 double radius = world.spigotConfig.itemMerge; Iterator iterator = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius)).iterator(); -- -2.19.0 +2.51.0 diff --git a/patches/server/0143-Don-t-change-the-Entity-Random-seed-for-squids.patch b/patches/server/0142-Don-t-change-the-Entity-Random-seed-for-squids.patch similarity index 92% rename from patches/server/0143-Don-t-change-the-Entity-Random-seed-for-squids.patch rename to patches/server/0142-Don-t-change-the-Entity-Random-seed-for-squids.patch index 871b2adb7..abb167f66 100644 --- a/patches/server/0143-Don-t-change-the-Entity-Random-seed-for-squids.patch +++ b/patches/server/0142-Don-t-change-the-Entity-Random-seed-for-squids.patch @@ -1,4 +1,4 @@ -From 7648f4b62ec685bdcc966f5fabebb852bdf72aab Mon Sep 17 00:00:00 2001 +From 75e89c30a61d5b54f2edacebbfed9342d97b001e Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 16:15:30 -0700 Subject: [PATCH] Don't change the Entity Random seed for squids @@ -18,5 +18,5 @@ index 31996b46..aaaece35 100644 this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this)); } -- -2.19.0 +2.51.0 diff --git a/patches/server/0144-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0143-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 98% rename from patches/server/0144-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0143-Break-up-and-make-tab-spam-limits-configurable.patch index 698b22a25..4ded0cb57 100644 --- a/patches/server/0144-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/patches/server/0143-Break-up-and-make-tab-spam-limits-configurable.patch @@ -1,4 +1,4 @@ -From 969987dffab7dffd35c3d5f02b20e96143df6dd8 Mon Sep 17 00:00:00 2001 +From d1625bc714b14c5f60e5a66f821a6a40adbe993d Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 16:24:48 -0700 Subject: [PATCH] Break up and make tab spam limits configurable @@ -69,5 +69,5 @@ index ebb6e479..0d643309 100644 public static double weaknessEffectModifier; private static void effectModifiers() -- -2.19.0 +2.51.0 diff --git a/patches/server/0145-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0144-Use-a-Queue-for-Queueing-Commands.patch similarity index 94% rename from patches/server/0145-Use-a-Queue-for-Queueing-Commands.patch rename to patches/server/0144-Use-a-Queue-for-Queueing-Commands.patch index 80165e711..c0fdb96b5 100644 --- a/patches/server/0145-Use-a-Queue-for-Queueing-Commands.patch +++ b/patches/server/0144-Use-a-Queue-for-Queueing-Commands.patch @@ -1,4 +1,4 @@ -From 4ac7b03b867f4bb1712bdc64ed7e287ecaa4f85e Mon Sep 17 00:00:00 2001 +From 3ef46d2faf6efca0cd25c05f5c6e131175d4e601 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 16:34:25 -0700 Subject: [PATCH] Use a Queue for Queueing Commands @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands Lists are bad as Queues mmmkay. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 6366031e..b821a7ae 100644 +index 87f7779e..f109351f 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -29,7 +29,7 @@ import org.bukkit.event.server.RemoteServerCommandEvent; @@ -32,5 +32,5 @@ index 6366031e..b821a7ae 100644 // CraftBukkit start - ServerCommand for preprocessing ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command); -- -2.19.0 +2.51.0 diff --git a/patches/server/0146-Ensure-chunks-are-always-loaded-on-hard-position-set.patch b/patches/server/0145-Ensure-chunks-are-always-loaded-on-hard-position-set.patch similarity index 94% rename from patches/server/0146-Ensure-chunks-are-always-loaded-on-hard-position-set.patch rename to patches/server/0145-Ensure-chunks-are-always-loaded-on-hard-position-set.patch index e9230acd6..269479ec4 100644 --- a/patches/server/0146-Ensure-chunks-are-always-loaded-on-hard-position-set.patch +++ b/patches/server/0145-Ensure-chunks-are-always-loaded-on-hard-position-set.patch @@ -1,4 +1,4 @@ -From c8f3c1947e01312d607c1a032f32ab96e07f360a Mon Sep 17 00:00:00 2001 +From 019e8d320ae4949cd23cb19f9f431ed07ee63500 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 16:41:09 -0700 Subject: [PATCH] Ensure chunks are always loaded on hard position sets @@ -29,5 +29,5 @@ index f1106939..70d70c03 100644 this.setYawPitch(f, f1); } -- -2.19.0 +2.51.0 diff --git a/patches/server/0147-Optimize-BlockPosition-helper-methods.patch b/patches/server/0146-Optimize-BlockPosition-helper-methods.patch similarity index 98% rename from patches/server/0147-Optimize-BlockPosition-helper-methods.patch rename to patches/server/0146-Optimize-BlockPosition-helper-methods.patch index f5292640c..43d05a429 100644 --- a/patches/server/0147-Optimize-BlockPosition-helper-methods.patch +++ b/patches/server/0146-Optimize-BlockPosition-helper-methods.patch @@ -1,4 +1,4 @@ -From 595ebbe029e0d1e07477ff6482d2056df8a76c39 Mon Sep 17 00:00:00 2001 +From c403afcd75fcf64600e6db4351122b84225fe659 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 16:50:53 -0700 Subject: [PATCH] Optimize BlockPosition helper methods @@ -123,5 +123,5 @@ index 0d0e0abb..4160d545 100644 public BlockPosition c(BaseBlockPosition baseblockposition) { -- -2.19.0 +2.51.0 diff --git a/patches/server/0148-Add-option-to-remove-randomness-in-arrow-trajectory.patch b/patches/server/0147-Add-option-to-remove-randomness-in-arrow-trajectory.patch similarity index 97% rename from patches/server/0148-Add-option-to-remove-randomness-in-arrow-trajectory.patch rename to patches/server/0147-Add-option-to-remove-randomness-in-arrow-trajectory.patch index 46a609de4..684db39bc 100644 --- a/patches/server/0148-Add-option-to-remove-randomness-in-arrow-trajectory.patch +++ b/patches/server/0147-Add-option-to-remove-randomness-in-arrow-trajectory.patch @@ -1,4 +1,4 @@ -From 603a17fac74504489b315218b89c451745a62e1b Mon Sep 17 00:00:00 2001 +From eb1a06031024b1c8da72c9d58172e37cba560bb3 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 24 Aug 2018 01:01:48 -0700 Subject: [PATCH] Add option to remove randomness in arrow trajectory @@ -57,5 +57,5 @@ index 0d643309..bf847c28 100644 public static double weaknessEffectModifier; private static void effectModifiers() -- -2.19.0 +2.51.0 diff --git a/patches/server/0149-Add-option-to-not-tick-empty-worlds.patch b/patches/server/0148-Add-option-to-not-tick-empty-worlds.patch similarity index 96% rename from patches/server/0149-Add-option-to-not-tick-empty-worlds.patch rename to patches/server/0148-Add-option-to-not-tick-empty-worlds.patch index d222cd62f..e129a1fce 100644 --- a/patches/server/0149-Add-option-to-not-tick-empty-worlds.patch +++ b/patches/server/0148-Add-option-to-not-tick-empty-worlds.patch @@ -1,11 +1,11 @@ -From a3abf0a412137d94ce293c5f80f9004327a71b4d Mon Sep 17 00:00:00 2001 +From f41a6f97c502a536e822d1511d2ef71fc7887198 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 24 Aug 2018 02:22:49 -0700 Subject: [PATCH] Add option to not tick empty worlds diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index bc13a465b..475e2507d 100644 +index bc13a465..475e2507 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -387,6 +387,45 @@ public class ChunkProviderServer implements IChunkProvider { @@ -92,7 +92,7 @@ index bc13a465b..475e2507d 100644 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 245e9735f..d8c20ed6f 100644 +index 1edae2a7..17edfba0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -820,6 +820,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -104,7 +104,7 @@ index 245e9735f..d8c20ed6f 100644 this.methodProfiler.a(worldserver.getWorldData().getName()); /* Drop global time updates diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e7cb442ba..27840e017 100644 +index e7cb442b..27840e01 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -56,6 +56,7 @@ import org.bukkit.plugin.Plugin; @@ -149,7 +149,7 @@ index e7cb442ba..27840e017 100644 public World getWorld() { return this; diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index bf847c28d..142a5faf6 100644 +index bf847c28..142a5faf 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java @@ -201,6 +201,11 @@ public class PaperSpigotConfig @@ -165,5 +165,5 @@ index bf847c28d..142a5faf6 100644 public static double weaknessEffectModifier; private static void effectModifiers() -- -2.30.2 +2.51.0 diff --git a/patches/server/0150-isChunkGenerated-API.patch b/patches/server/0149-isChunkGenerated-API.patch similarity index 91% rename from patches/server/0150-isChunkGenerated-API.patch rename to patches/server/0149-isChunkGenerated-API.patch index ac8dcbadb..dbbc1885f 100644 --- a/patches/server/0150-isChunkGenerated-API.patch +++ b/patches/server/0149-isChunkGenerated-API.patch @@ -1,11 +1,11 @@ -From 83b48a73fc8cba0c3994f78ae3a16ea63d01642a Mon Sep 17 00:00:00 2001 +From 985d07a21816f4e50da6a7b0668007e0cd2c9e44 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 24 Aug 2018 02:33:02 -0700 Subject: [PATCH] isChunkGenerated API diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 475e2507d..0602beac9 100644 +index 475e2507..0602beac 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -129,6 +129,12 @@ public class ChunkProviderServer implements IChunkProvider { @@ -22,7 +22,7 @@ index 475e2507d..0602beac9 100644 public Chunk getChunkIfLoaded(int x, int z) { return chunks.get(LongHash.toLong(x, z)); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 27840e017..c70c4c174 100644 +index 27840e01..c70c4c17 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -663,6 +663,12 @@ public class CraftWorld implements World { @@ -39,5 +39,5 @@ index 27840e017..c70c4c174 100644 return generator; } -- -2.30.2 +2.51.0 diff --git a/patches/server/0151-Empty-chunk-API.patch b/patches/server/0150-Empty-chunk-API.patch similarity index 95% rename from patches/server/0151-Empty-chunk-API.patch rename to patches/server/0150-Empty-chunk-API.patch index d8bf265a2..4bf8f4941 100644 --- a/patches/server/0151-Empty-chunk-API.patch +++ b/patches/server/0150-Empty-chunk-API.patch @@ -1,4 +1,4 @@ -From aa0fa541fbdd9c3d346b26257a9472068ce4128a Mon Sep 17 00:00:00 2001 +From 0aad9995d5611901538232f1a76efb4dc1012ff8 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 24 Aug 2018 02:39:05 -0700 Subject: [PATCH] Empty chunk API @@ -36,5 +36,5 @@ index 80de4eb1..14b2f040 100644 int count = 0, index = 0; net.minecraft.server.Chunk chunk = getHandle(); -- -2.19.0 +2.51.0 diff --git a/patches/server/0152-Add-method-to-handle-unhandledtags.patch b/patches/server/0151-Add-method-to-handle-unhandledtags.patch similarity index 94% rename from patches/server/0152-Add-method-to-handle-unhandledtags.patch rename to patches/server/0151-Add-method-to-handle-unhandledtags.patch index 14194bedd..9e56c2026 100644 --- a/patches/server/0152-Add-method-to-handle-unhandledtags.patch +++ b/patches/server/0151-Add-method-to-handle-unhandledtags.patch @@ -1,4 +1,4 @@ -From 492457eea45dc235bafd50ba148938e037fa264f Mon Sep 17 00:00:00 2001 +From e124092720831d0f3a5c2acb7c2731557162414e Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 24 Aug 2018 03:45:35 -0700 Subject: [PATCH] Add method to handle unhandledtags @@ -30,5 +30,5 @@ index 16fc76ad..19e35cbe 100644 public ImmutableMaterialSet getCanDestroy() { return canDestroy; -- -2.19.0 +2.51.0 diff --git a/patches/server/0153-FallingBlock-form-block-flag.patch b/patches/server/0152-FallingBlock-form-block-flag.patch similarity index 97% rename from patches/server/0153-FallingBlock-form-block-flag.patch rename to patches/server/0152-FallingBlock-form-block-flag.patch index 8fb630826..71f2bf108 100644 --- a/patches/server/0153-FallingBlock-form-block-flag.patch +++ b/patches/server/0152-FallingBlock-form-block-flag.patch @@ -1,4 +1,4 @@ -From 4d8184e8f74c63716d82c0cbb025d1f8d878cfac Mon Sep 17 00:00:00 2001 +From 06b0b98712082ec9d3f545420e81a3624e25f1fe Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Fri, 24 Aug 2018 20:50:15 -0700 Subject: [PATCH] FallingBlock form block flag @@ -44,5 +44,5 @@ index eedb66f5..f57428aa 100644 + } } -- -2.19.0 +2.51.0 diff --git a/patches/server/0154-Trade-API.patch b/patches/server/0153-Trade-API.patch similarity index 97% rename from patches/server/0154-Trade-API.patch rename to patches/server/0153-Trade-API.patch index f887776b4..745bbe179 100644 --- a/patches/server/0154-Trade-API.patch +++ b/patches/server/0153-Trade-API.patch @@ -1,4 +1,4 @@ -From bd158aa8916748ffea67b4e2585422aed65bb694 Mon Sep 17 00:00:00 2001 +From 9c1307fac523e9098ec009531468ebdd20babf8b Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 25 Aug 2018 00:19:58 -0700 Subject: [PATCH] Trade API @@ -63,5 +63,5 @@ index a12806d4..80332252 100644 if (!force) { Block block = location.getBlock(); -- -2.19.0 +2.51.0 diff --git a/patches/server/0155-Unify-Configs.patch b/patches/server/0154-Unify-Configs.patch similarity index 99% rename from patches/server/0155-Unify-Configs.patch rename to patches/server/0154-Unify-Configs.patch index ce5ee2bf6..329970296 100644 --- a/patches/server/0155-Unify-Configs.patch +++ b/patches/server/0154-Unify-Configs.patch @@ -1,11 +1,11 @@ -From 1e34d49f9af5a969974044c9b9e232e3be3dddf3 Mon Sep 17 00:00:00 2001 +From d9dc2ea0f241fb4f972c860d9d9fe86226fae039 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 25 Aug 2018 18:36:14 -0700 Subject: [PATCH] Unify Configs diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index b821a7ae..57ba6a8f 100644 +index f109351f..cb98ea2a 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -24,6 +24,7 @@ import co.aikar.timings.SpigotTimings; // Spigot @@ -2270,5 +2270,5 @@ index 733307c2..00000000 - icanhasbukkit: - - "version $1-" -- -2.19.0 +2.51.0 diff --git a/patches/server/0156-Attribute-API.patch b/patches/server/0155-Attribute-API.patch similarity index 99% rename from patches/server/0156-Attribute-API.patch rename to patches/server/0155-Attribute-API.patch index b38d9e632..eafb719d4 100644 --- a/patches/server/0156-Attribute-API.patch +++ b/patches/server/0155-Attribute-API.patch @@ -1,4 +1,4 @@ -From 58c45f511fbe852e6191545c75649d725a726cb6 Mon Sep 17 00:00:00 2001 +From 8d8bd6188941a45a55debe9179e994c4aa0309b9 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sun, 26 Aug 2018 16:31:42 -0700 Subject: [PATCH] Attribute API @@ -703,5 +703,5 @@ index 19e35cbe..37fde0ec 100644 CraftMetaMap.MAP_SCALING.NBT, CraftMetaPotion.POTION_EFFECTS.NBT, -- -2.19.0 +2.51.0 diff --git a/patches/server/0157-Add-world-broadcast-API.patch b/patches/server/0156-Add-world-broadcast-API.patch similarity index 92% rename from patches/server/0157-Add-world-broadcast-API.patch rename to patches/server/0156-Add-world-broadcast-API.patch index 1aff46d6f..08e80b9bc 100644 --- a/patches/server/0157-Add-world-broadcast-API.patch +++ b/patches/server/0156-Add-world-broadcast-API.patch @@ -1,11 +1,11 @@ -From f39fd4a0eae4b0be62cf343072272811d9022422 Mon Sep 17 00:00:00 2001 +From 1737e69a3fbd6ec76a47417b7a19f82ae6cf597e Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 27 Aug 2018 00:03:32 -0700 Subject: [PATCH] Add world broadcast API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c70c4c174..edf2bafd4 100644 +index c70c4c17..edf2bafd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -12,6 +12,7 @@ import java.util.Random; @@ -39,5 +39,5 @@ index c70c4c174..edf2bafd4 100644 // Spigot start save(true); -- -2.30.2 +2.51.0 diff --git a/patches/server/0158-Per-World-Custom-Crafting-API.patch b/patches/server/0157-Per-World-Custom-Crafting-API.patch similarity index 96% rename from patches/server/0158-Per-World-Custom-Crafting-API.patch rename to patches/server/0157-Per-World-Custom-Crafting-API.patch index 6e8d5fa8f..2af205488 100644 --- a/patches/server/0158-Per-World-Custom-Crafting-API.patch +++ b/patches/server/0157-Per-World-Custom-Crafting-API.patch @@ -1,11 +1,11 @@ -From def0d75d76d8e969f8b78f0e599415fe1a987208 Mon Sep 17 00:00:00 2001 +From 5e6d7450818ae4e976d3276dcbbf44be36b93fae Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 27 Aug 2018 02:31:21 -0700 Subject: [PATCH] Per World Custom Crafting API diff --git a/src/main/java/net/minecraft/server/ContainerFurnace.java b/src/main/java/net/minecraft/server/ContainerFurnace.java -index 04cccbb68..be9b4cfd7 100644 +index 04cccbb6..be9b4cfd 100644 --- a/src/main/java/net/minecraft/server/ContainerFurnace.java +++ b/src/main/java/net/minecraft/server/ContainerFurnace.java @@ -104,7 +104,7 @@ public class ContainerFurnace extends Container { @@ -18,7 +18,7 @@ index 04cccbb68..be9b4cfd7 100644 return null; } diff --git a/src/main/java/net/minecraft/server/ContainerPlayer.java b/src/main/java/net/minecraft/server/ContainerPlayer.java -index a86f896b4..94e329eee 100644 +index a86f896b..94e329ee 100644 --- a/src/main/java/net/minecraft/server/ContainerPlayer.java +++ b/src/main/java/net/minecraft/server/ContainerPlayer.java @@ -63,8 +63,8 @@ public class ContainerPlayer extends Container { @@ -33,7 +33,7 @@ index a86f896b4..94e329eee 100644 if (super.listeners.size() < 1) { return; diff --git a/src/main/java/net/minecraft/server/ContainerWorkbench.java b/src/main/java/net/minecraft/server/ContainerWorkbench.java -index 48d524e54..f63011e3d 100644 +index 48d524e5..f63011e3 100644 --- a/src/main/java/net/minecraft/server/ContainerWorkbench.java +++ b/src/main/java/net/minecraft/server/ContainerWorkbench.java @@ -52,8 +52,8 @@ public class ContainerWorkbench extends Container { @@ -48,7 +48,7 @@ index 48d524e54..f63011e3d 100644 if (super.listeners.size() < 1) { return; diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java -index 544ff0a6c..2c2110d4a 100644 +index 544ff0a6..2c2110d4 100644 --- a/src/main/java/net/minecraft/server/CraftingManager.java +++ b/src/main/java/net/minecraft/server/CraftingManager.java @@ -13,17 +13,12 @@ import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit @@ -79,7 +79,7 @@ index 544ff0a6c..2c2110d4a 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java -index 29611a194..9a3d3751b 100644 +index 29611a19..9a3d3751 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -222,7 +222,7 @@ public class EntitySheep extends EntityAnimal { @@ -92,7 +92,7 @@ index 29611a194..9a3d3751b 100644 if (itemstack != null && itemstack.getItem() == Items.DYE) { diff --git a/src/main/java/net/minecraft/server/IRecipe.java b/src/main/java/net/minecraft/server/IRecipe.java -index ffc65a242..444af5b06 100644 +index ffc65a24..444af5b0 100644 --- a/src/main/java/net/minecraft/server/IRecipe.java +++ b/src/main/java/net/minecraft/server/IRecipe.java @@ -4,7 +4,7 @@ public interface IRecipe { @@ -105,7 +105,7 @@ index ffc65a242..444af5b06 100644 int a(); diff --git a/src/main/java/net/minecraft/server/RecipeArmorDye.java b/src/main/java/net/minecraft/server/RecipeArmorDye.java -index 43a1cf8dd..7e7a18dcb 100644 +index 43a1cf8d..7e7a18dc 100644 --- a/src/main/java/net/minecraft/server/RecipeArmorDye.java +++ b/src/main/java/net/minecraft/server/RecipeArmorDye.java @@ -40,7 +40,7 @@ public class RecipeArmorDye extends ShapelessRecipes implements IRecipe { // Cra @@ -118,7 +118,7 @@ index 43a1cf8dd..7e7a18dcb 100644 int[] aint = new int[3]; int i = 0; diff --git a/src/main/java/net/minecraft/server/RecipeBookClone.java b/src/main/java/net/minecraft/server/RecipeBookClone.java -index 264019d9d..4d591cbf3 100644 +index 264019d9..4d591cbf 100644 --- a/src/main/java/net/minecraft/server/RecipeBookClone.java +++ b/src/main/java/net/minecraft/server/RecipeBookClone.java @@ -35,7 +35,7 @@ public class RecipeBookClone extends ShapelessRecipes implements IRecipe { // Cr @@ -131,7 +131,7 @@ index 264019d9d..4d591cbf3 100644 ItemStack itemstack = null; diff --git a/src/main/java/net/minecraft/server/RecipeFireworks.java b/src/main/java/net/minecraft/server/RecipeFireworks.java -index ba9ce61bf..be10c9731 100644 +index ba9ce61b..be10c973 100644 --- a/src/main/java/net/minecraft/server/RecipeFireworks.java +++ b/src/main/java/net/minecraft/server/RecipeFireworks.java @@ -163,7 +163,7 @@ public class RecipeFireworks extends ShapelessRecipes implements IRecipe { // Cr @@ -144,7 +144,7 @@ index ba9ce61bf..be10c9731 100644 } diff --git a/src/main/java/net/minecraft/server/RecipeMapClone.java b/src/main/java/net/minecraft/server/RecipeMapClone.java -index 579f6d1d2..1663898a1 100644 +index 579f6d1d..1663898a 100644 --- a/src/main/java/net/minecraft/server/RecipeMapClone.java +++ b/src/main/java/net/minecraft/server/RecipeMapClone.java @@ -35,7 +35,7 @@ public class RecipeMapClone extends ShapelessRecipes implements IRecipe { // Cra @@ -157,7 +157,7 @@ index 579f6d1d2..1663898a1 100644 ItemStack itemstack = null; diff --git a/src/main/java/net/minecraft/server/RecipeRepair.java b/src/main/java/net/minecraft/server/RecipeRepair.java -index 187e59aef..0bac6309e 100644 +index 187e59ae..0bac6309 100644 --- a/src/main/java/net/minecraft/server/RecipeRepair.java +++ b/src/main/java/net/minecraft/server/RecipeRepair.java @@ -32,7 +32,7 @@ public class RecipeRepair extends ShapelessRecipes implements IRecipe { // Craft @@ -179,7 +179,7 @@ index 187e59aef..0bac6309e 100644 // return new ItemStack(itemstack2.getItem(), 1, i1); // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/RecipesBanner.java b/src/main/java/net/minecraft/server/RecipesBanner.java -index 4a77c77d1..0e60bd0ca 100644 +index 4a77c77d..0e60bd0c 100644 --- a/src/main/java/net/minecraft/server/RecipesBanner.java +++ b/src/main/java/net/minecraft/server/RecipesBanner.java @@ -54,7 +54,7 @@ public class RecipesBanner { @@ -201,7 +201,7 @@ index 4a77c77d1..0e60bd0ca 100644 ItemStack itemstack = inventorycrafting.getItem(i); diff --git a/src/main/java/net/minecraft/server/RecipesFurnace.java b/src/main/java/net/minecraft/server/RecipesFurnace.java -index d16fa9ec7..d4c2319fc 100644 +index d16fa9ec..d4c2319f 100644 --- a/src/main/java/net/minecraft/server/RecipesFurnace.java +++ b/src/main/java/net/minecraft/server/RecipesFurnace.java @@ -7,14 +7,9 @@ import java.util.Map.Entry; @@ -221,7 +221,7 @@ index d16fa9ec7..d4c2319fc 100644 public RecipesFurnace() { // PAIL: Public this.registerRecipe(Blocks.IRON_ORE, new ItemStack(Items.IRON_INGOT), 0.7F); diff --git a/src/main/java/net/minecraft/server/ShapedRecipes.java b/src/main/java/net/minecraft/server/ShapedRecipes.java -index cac2e78bb..17d787cfc 100644 +index cac2e78b..17d787cf 100644 --- a/src/main/java/net/minecraft/server/ShapedRecipes.java +++ b/src/main/java/net/minecraft/server/ShapedRecipes.java @@ -146,7 +146,7 @@ public class ShapedRecipes implements IRecipe { @@ -234,7 +234,7 @@ index cac2e78bb..17d787cfc 100644 if (this.e) { diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java -index e9934f904..0d46b8d5e 100644 +index e9934f90..0d46b8d5 100644 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java @@ -83,7 +83,7 @@ public class ShapelessRecipes implements IRecipe { @@ -247,7 +247,7 @@ index e9934f904..0d46b8d5e 100644 } diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java -index 914be4e8d..24927ede3 100644 +index 914be4e8..24927ede 100644 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java @@ -41,7 +41,7 @@ public class SlotFurnaceResult extends Slot { @@ -260,7 +260,7 @@ index 914be4e8d..24927ede3 100644 if (f == 0.0F) { diff --git a/src/main/java/net/minecraft/server/SlotResult.java b/src/main/java/net/minecraft/server/SlotResult.java -index d2551cfb3..ca377490e 100644 +index d2551cfb..ca377490 100644 --- a/src/main/java/net/minecraft/server/SlotResult.java +++ b/src/main/java/net/minecraft/server/SlotResult.java @@ -83,7 +83,7 @@ public class SlotResult extends Slot { @@ -273,7 +273,7 @@ index d2551cfb3..ca377490e 100644 for (int i = 0; i < aitemstack.length; ++i) { ItemStack itemstack1 = this.a.getItem(i); diff --git a/src/main/java/net/minecraft/server/StatisticList.java b/src/main/java/net/minecraft/server/StatisticList.java -index b5ceb9a68..c56507e35 100644 +index b5ceb9a6..c56507e3 100644 --- a/src/main/java/net/minecraft/server/StatisticList.java +++ b/src/main/java/net/minecraft/server/StatisticList.java @@ -79,7 +79,7 @@ public class StatisticList { @@ -295,7 +295,7 @@ index b5ceb9a68..c56507e35 100644 while (iterator.hasNext()) { ItemStack itemstack = (ItemStack) iterator.next(); diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 37a43fdc8..ffc902c94 100644 +index 37a43fdc..ffc902c9 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -270,7 +270,7 @@ public class TileEntityFurnace extends TileEntityContainer implements IUpdatePla @@ -317,7 +317,7 @@ index 37a43fdc8..ffc902c94 100644 // CraftBukkit start - fire FurnaceSmeltEvent CraftItemStack source = CraftItemStack.asCraftMirror(this.items[0]); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e68997751..138b17f30 100644 +index e6899775..138b17f3 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -142,6 +142,8 @@ public abstract class World implements IBlockAccess { @@ -330,7 +330,7 @@ index e68997751..138b17f30 100644 public static long chunkToKey(int x, int z) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4dc6ebfcf..d0901cac7 100644 +index 4dc6ebfc..d0901cac 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -5,7 +5,6 @@ import java.io.File; @@ -401,7 +401,7 @@ index 4dc6ebfcf..d0901cac7 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index edf2bafd4..19835eac7 100644 +index edf2bafd..19835eac 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -34,7 +34,12 @@ import org.bukkit.block.BlockState; @@ -503,7 +503,7 @@ index edf2bafd4..19835eac7 100644 private final Spigot spigot = new Spigot() { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftFurnaceRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftFurnaceRecipe.java -index 69f17db84..bc853a0fa 100644 +index 69f17db8..bc853a0f 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftFurnaceRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftFurnaceRecipe.java @@ -1,8 +1,8 @@ @@ -529,7 +529,7 @@ index 69f17db84..bc853a0fa 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java -index d3e03e247..232d1bbdd 100644 +index d3e03e24..232d1bbd 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java @@ -1,7 +1,9 @@ @@ -544,7 +544,7 @@ index d3e03e247..232d1bbdd 100644 + void addToCraftingManager(CraftingManager craftingManager, RecipesFurnace recipesFurnace); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java -index baea75977..622e4fe76 100644 +index baea7597..622e4fe7 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java @@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.inventory; @@ -573,7 +573,7 @@ index baea75977..622e4fe76 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java -index 53479c72c..8b2ea3f58 100644 +index 53479c72..8b2ea3f5 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java @@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.inventory; @@ -602,7 +602,7 @@ index 53479c72c..8b2ea3f58 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java -index 53b53b799..5563c8691 100644 +index 53b53b79..5563c869 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java @@ -13,11 +13,20 @@ public class RecipeIterator implements Iterator { @@ -639,5 +639,5 @@ index 53b53b799..5563c8691 100644 return new CraftFurnaceRecipe(stack, CraftItemStack.asCraftMirror(item)); } -- -2.30.2 +2.51.0 diff --git a/patches/server/0159-Mojang-task-queue-access.patch b/patches/server/0158-Mojang-task-queue-access.patch similarity index 99% rename from patches/server/0159-Mojang-task-queue-access.patch rename to patches/server/0158-Mojang-task-queue-access.patch index 5a572516a..0762d5132 100644 --- a/patches/server/0159-Mojang-task-queue-access.patch +++ b/patches/server/0158-Mojang-task-queue-access.patch @@ -1,11 +1,11 @@ -From e4f0a9cbf542288510dbe29c151397c9f3011adc Mon Sep 17 00:00:00 2001 +From 95279920e17c991d486d84755721596f4d87af7f Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 27 Aug 2018 14:56:58 -0700 Subject: [PATCH] Mojang task queue access diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 57ba6a8f..edc6e270 100644 +index cb98ea2a..8e1444ea 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -362,9 +362,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -81,7 +81,7 @@ index 7f86691a..d4bde8b9 100644 return wait.get(); } catch (InterruptedException | ExecutionException e) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d8c20ed6..40cd53ab 100644 +index 17edfba0..333873a9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -25,6 +25,7 @@ import java.util.ArrayList; @@ -366,5 +366,5 @@ index 429c2580..e366f56e 100644 @Override public void run() -- -2.19.0 +2.51.0 diff --git a/patches/server/0160-Server-suspend-API.patch b/patches/server/0159-Server-suspend-API.patch similarity index 99% rename from patches/server/0160-Server-suspend-API.patch rename to patches/server/0159-Server-suspend-API.patch index ae4525eef..82e6c6a1b 100644 --- a/patches/server/0160-Server-suspend-API.patch +++ b/patches/server/0159-Server-suspend-API.patch @@ -1,11 +1,11 @@ -From 777cfd121ea95ef11aba897bc6e4ac39e4a95656 Mon Sep 17 00:00:00 2001 +From 6cc74fbf30f59fb0747e124e2c70ad687ddb6439 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Mon, 27 Aug 2018 23:39:11 -0700 Subject: [PATCH] Server suspend API diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index edc6e270..9d0656f5 100644 +index 8e1444ea..5123daa4 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -295,6 +295,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -38,7 +38,7 @@ index 5bfad62e..d2b51eed 100644 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 40cd53ab..242d0582 100644 +index 333873a9..c4c0c632 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -21,6 +21,7 @@ import java.io.IOException; @@ -435,5 +435,5 @@ index 06ad3826..8eba42e3 100644 { Logger log = Bukkit.getServer().getLogger(); -- -2.19.0 +2.51.0 diff --git a/patches/server/0161-Better-handling-of-plugin-startup-errors.patch b/patches/server/0160-Better-handling-of-plugin-startup-errors.patch similarity index 97% rename from patches/server/0161-Better-handling-of-plugin-startup-errors.patch rename to patches/server/0160-Better-handling-of-plugin-startup-errors.patch index de5b5bb23..9a8685f38 100644 --- a/patches/server/0161-Better-handling-of-plugin-startup-errors.patch +++ b/patches/server/0160-Better-handling-of-plugin-startup-errors.patch @@ -1,11 +1,11 @@ -From 64e636f9f4ec95f90e91c72ba634359ffed40701 Mon Sep 17 00:00:00 2001 +From e535b911b317ee38b6b249ae5bbc61e2a621c232 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 28 Aug 2018 20:09:00 -0700 Subject: [PATCH] Better handling of plugin startup errors diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 9d0656f5..a6a7c476 100644 +index 5123daa4..79a53cc4 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -358,7 +358,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -18,7 +18,7 @@ index 9d0656f5..a6a7c476 100644 public void B() { // CraftBukkit - fix decompile error diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 242d0582..fc26607a 100644 +index c4c0c632..61300499 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -137,6 +137,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -118,5 +118,5 @@ index 31279983..9360eac7 100644 public static double weaknessEffectModifier; private static void effectModifiers() -- -2.19.0 +2.51.0 diff --git a/patches/server/0162-Fix-PlayerInteractEvent-not-cancelling-properly.patch b/patches/server/0161-Fix-PlayerInteractEvent-not-cancelling-properly.patch similarity index 96% rename from patches/server/0162-Fix-PlayerInteractEvent-not-cancelling-properly.patch rename to patches/server/0161-Fix-PlayerInteractEvent-not-cancelling-properly.patch index 8d5621525..cca7ca749 100644 --- a/patches/server/0162-Fix-PlayerInteractEvent-not-cancelling-properly.patch +++ b/patches/server/0161-Fix-PlayerInteractEvent-not-cancelling-properly.patch @@ -1,4 +1,4 @@ -From a24621663a9377ee1cba7c662e3e0caa99272194 Mon Sep 17 00:00:00 2001 +From 9dc5e0cde33fe6b900cebe7f4d1e769b82769c8b Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Thu, 6 Sep 2018 01:25:56 -0700 Subject: [PATCH] Fix PlayerInteractEvent not cancelling properly @@ -35,5 +35,5 @@ index 429c1d57..21747b92 100644 } } -- -2.19.0 +2.51.0 diff --git a/patches/server/0163-Add-Block-Strength-API.patch b/patches/server/0162-Add-Block-Strength-API.patch similarity index 98% rename from patches/server/0163-Add-Block-Strength-API.patch rename to patches/server/0162-Add-Block-Strength-API.patch index 5ccf9de4d..4669671b8 100644 --- a/patches/server/0163-Add-Block-Strength-API.patch +++ b/patches/server/0162-Add-Block-Strength-API.patch @@ -1,4 +1,4 @@ -From 34105ebdcaa7f4776a25ba954f701fe640a16230 Mon Sep 17 00:00:00 2001 +From 12c32d310370ed166485dcdb4f0fe88cee28240d Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Sat, 15 Sep 2018 01:44:04 -0700 Subject: [PATCH] Add Block Strength API @@ -108,5 +108,5 @@ index ecef909a..9897e0b4 100644 public Block getFace(final BlockFace face) { return getRelative(face, 1); -- -2.20.1 +2.51.0 diff --git a/patches/server/0164-Improve-locale-API-and-add-methods-for-translating-c.patch b/patches/server/0163-Improve-locale-API-and-add-methods-for-translating-c.patch similarity index 95% rename from patches/server/0164-Improve-locale-API-and-add-methods-for-translating-c.patch rename to patches/server/0163-Improve-locale-API-and-add-methods-for-translating-c.patch index 2eab9d03f..083b8f8db 100644 --- a/patches/server/0164-Improve-locale-API-and-add-methods-for-translating-c.patch +++ b/patches/server/0163-Improve-locale-API-and-add-methods-for-translating-c.patch @@ -1,11 +1,11 @@ -From d7bd96183495c83e5f1177aadb01f16a466803cd Mon Sep 17 00:00:00 2001 +From b7ae2b7687bc3d5bb46d6505e024b0ab8ef9e589 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Wed, 26 Sep 2018 23:04:03 -0500 Subject: [PATCH] Improve locale API and add methods for translating components diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 49a2227..24d1538 100644 +index 49a2227c..24d15388 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1031,6 +1031,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -17,7 +17,7 @@ index 49a2227..24d1538 100644 // PaperSpigot end this.bR = packetplayinsettings.c(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b85669b..67be13f 100644 +index 65ed6db3..8475668e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -88,6 +88,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -64,5 +64,5 @@ index b85669b..67be13f 100644 + // SportPaper end } -- -2.6.4 +2.51.0 diff --git a/patches/server/0165-Add-translatable-methods-to-world-broadcast-API.patch b/patches/server/0164-Add-translatable-methods-to-world-broadcast-API.patch similarity index 92% rename from patches/server/0165-Add-translatable-methods-to-world-broadcast-API.patch rename to patches/server/0164-Add-translatable-methods-to-world-broadcast-API.patch index f0d42cfb7..1b4eb705b 100644 --- a/patches/server/0165-Add-translatable-methods-to-world-broadcast-API.patch +++ b/patches/server/0164-Add-translatable-methods-to-world-broadcast-API.patch @@ -1,11 +1,11 @@ -From b1df953e7bd0be5aa0ee8bfc93a9da426c64b3cc Mon Sep 17 00:00:00 2001 +From 8ba6cd64aee5c417a8d5a93762d6214b5d34dc80 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Thu, 27 Sep 2018 08:31:55 -0500 Subject: [PATCH] Add translatable methods to world broadcast API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 19835eac7..4135d5954 100644 +index 19835eac..4135d595 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -15,6 +15,7 @@ import java.util.UUID; @@ -34,5 +34,5 @@ index 19835eac7..4135d5954 100644 // Spigot start save(true); -- -2.30.2 +2.51.0 diff --git a/patches/server/0166-Make-PlayerInfo-non-static-again.patch b/patches/server/0165-Make-PlayerInfo-non-static-again.patch similarity index 96% rename from patches/server/0166-Make-PlayerInfo-non-static-again.patch rename to patches/server/0165-Make-PlayerInfo-non-static-again.patch index 2f5e9bb56..70c9f4f0f 100644 --- a/patches/server/0166-Make-PlayerInfo-non-static-again.patch +++ b/patches/server/0165-Make-PlayerInfo-non-static-again.patch @@ -1,4 +1,4 @@ -From 6e87b9b6d8763ffcfe3cc1308f2eed6217d0579a Mon Sep 17 00:00:00 2001 +From 7a6d3085a465f02784632e05394a74caafd8fa39 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Mon, 21 Jan 2019 23:32:28 -0600 Subject: [PATCH] Make PlayerInfo non-static again @@ -40,7 +40,7 @@ index ad6bdace..2d699afa 100644 public net.md_5.bungee.api.chat.BaseComponent[] displayName; // SportBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 67be13f4..442c8119 100644 +index 8475668e..e92e90f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -434,7 +434,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -53,5 +53,5 @@ index 67be13f4..442c8119 100644 getHandle().playerInteractManager.getGameMode(), getHandle().listName)); -- -2.20.1 +2.51.0 diff --git a/patches/server/0167-Add-fast-block-change-API.patch b/patches/server/0166-Add-fast-block-change-API.patch similarity index 95% rename from patches/server/0167-Add-fast-block-change-API.patch rename to patches/server/0166-Add-fast-block-change-API.patch index 54076dec5..623061327 100644 --- a/patches/server/0167-Add-fast-block-change-API.patch +++ b/patches/server/0166-Add-fast-block-change-API.patch @@ -1,11 +1,11 @@ -From 6b7bf62297fc1fa0298cc80eabb33bb5c8a63763 Mon Sep 17 00:00:00 2001 +From ac4dac2ed325d262ab5e7c1a6f7169431b9fb644 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Tue, 5 Feb 2019 00:59:06 -0600 Subject: [PATCH] Add fast block change API diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 4160d545a..1f28a9977 100644 +index 4160d545..1f28a997 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -318,4 +318,10 @@ public class BlockPosition extends BaseBlockPosition { @@ -20,7 +20,7 @@ index 4160d545a..1f28a9977 100644 + // SportPaper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4135d5954..dc81e2607 100644 +index 4135d595..dc81e260 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -875,6 +875,7 @@ public class CraftWorld implements World { @@ -67,5 +67,5 @@ index 4135d5954..dc81e2607 100644 // Spigot start save(true); -- -2.30.2 +2.51.0 diff --git a/patches/server/0168-Make-CraftMetaItem-public-add-missing-clone-methods.patch b/patches/server/0167-Make-CraftMetaItem-public-add-missing-clone-methods.patch similarity index 97% rename from patches/server/0168-Make-CraftMetaItem-public-add-missing-clone-methods.patch rename to patches/server/0167-Make-CraftMetaItem-public-add-missing-clone-methods.patch index d183129c9..9216faf3c 100644 --- a/patches/server/0168-Make-CraftMetaItem-public-add-missing-clone-methods.patch +++ b/patches/server/0167-Make-CraftMetaItem-public-add-missing-clone-methods.patch @@ -1,4 +1,4 @@ -From 3f9a03a09144bb1472305ec039c13ddb8751f1fc Mon Sep 17 00:00:00 2001 +From 879b8db3cbd77ec65cf63cf093a4a4c4d2fb10a9 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Mon, 25 Feb 2019 15:08:18 -0600 Subject: [PATCH] Make CraftMetaItem public, add missing clone() methods @@ -66,5 +66,5 @@ index 37fde0ec..04e783c3 100644 static class ItemMetaKey { -- -2.20.1 +2.51.0 diff --git a/patches/server/0169-Personalized-component-API.patch b/patches/server/0168-Personalized-component-API.patch similarity index 92% rename from patches/server/0169-Personalized-component-API.patch rename to patches/server/0168-Personalized-component-API.patch index 36a3bd266..9f30b83bd 100644 --- a/patches/server/0169-Personalized-component-API.patch +++ b/patches/server/0168-Personalized-component-API.patch @@ -1,11 +1,11 @@ -From 632e4654cdb32e97b6138913d6fee8036004af17 Mon Sep 17 00:00:00 2001 +From f3a6944af120562327a5252085fa9820064a2d94 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Tue, 5 Mar 2019 21:25:54 -0600 Subject: [PATCH] Personalized component API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index dc81e2607..e184d4168 100644 +index dc81e260..e184d416 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -15,7 +15,7 @@ import java.util.UUID; @@ -33,5 +33,5 @@ index dc81e2607..e184d4168 100644 } -- -2.30.2 +2.51.0 diff --git a/patches/server/0170-Expose-PacketPlayOutSpawnEntity-constructor.patch b/patches/server/0169-Expose-PacketPlayOutSpawnEntity-constructor.patch similarity index 96% rename from patches/server/0170-Expose-PacketPlayOutSpawnEntity-constructor.patch rename to patches/server/0169-Expose-PacketPlayOutSpawnEntity-constructor.patch index 4f38471ac..e7c5b7114 100644 --- a/patches/server/0170-Expose-PacketPlayOutSpawnEntity-constructor.patch +++ b/patches/server/0169-Expose-PacketPlayOutSpawnEntity-constructor.patch @@ -1,4 +1,4 @@ -From b6576302e9cce23cb1ce678242a4ba544d8f8c92 Mon Sep 17 00:00:00 2001 +From 92972a7bc63f8bc545b4a2f1c721016d5c3563de Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Fri, 8 Mar 2019 16:01:32 -0600 Subject: [PATCH] Expose PacketPlayOutSpawnEntity constructor @@ -49,5 +49,5 @@ index 69dd590a..8a6accf5 100644 - } } -- -2.20.1 +2.51.0 diff --git a/patches/server/0171-Fix-NPE-in-CraftChunk-getBlocks.patch b/patches/server/0170-Fix-NPE-in-CraftChunk-getBlocks.patch similarity index 93% rename from patches/server/0171-Fix-NPE-in-CraftChunk-getBlocks.patch rename to patches/server/0170-Fix-NPE-in-CraftChunk-getBlocks.patch index de793a505..f239a2324 100644 --- a/patches/server/0171-Fix-NPE-in-CraftChunk-getBlocks.patch +++ b/patches/server/0170-Fix-NPE-in-CraftChunk-getBlocks.patch @@ -1,4 +1,4 @@ -From 0c65cd292b9c0b2e63338e31348c6ec232d99d75 Mon Sep 17 00:00:00 2001 +From 3680385c740bd094bed75cf2cf5975dd61d136a7 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Thu, 28 Mar 2019 18:09:05 -0500 Subject: [PATCH] Fix NPE in CraftChunk#getBlocks @@ -18,5 +18,5 @@ index 7907c983..abab23d6 100644 } } -- -2.20.1 +2.51.0 diff --git a/patches/server/0172-Fix-SO-from-addRecipe.patch b/patches/server/0171-Fix-SO-from-addRecipe.patch similarity index 90% rename from patches/server/0172-Fix-SO-from-addRecipe.patch rename to patches/server/0171-Fix-SO-from-addRecipe.patch index fdcf322ec..1503acbaa 100644 --- a/patches/server/0172-Fix-SO-from-addRecipe.patch +++ b/patches/server/0171-Fix-SO-from-addRecipe.patch @@ -1,4 +1,4 @@ -From 43826656465f307f3386c232822cb1a637cb32bc Mon Sep 17 00:00:00 2001 +From 15ac1516e2d99aacbbc16d0680f37c43893ecfcb Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Sat, 30 Mar 2019 23:32:45 -0500 Subject: [PATCH] Fix SO from addRecipe @@ -18,5 +18,5 @@ index dba05d97..7ffc5f5b 100644 } -- -2.20.1 +2.51.0 diff --git a/patches/server/0173-Add-reason-to-potion-effect-add-event.patch b/patches/server/0172-Add-reason-to-potion-effect-add-event.patch similarity index 99% rename from patches/server/0173-Add-reason-to-potion-effect-add-event.patch rename to patches/server/0172-Add-reason-to-potion-effect-add-event.patch index 814d21c68..2c796437a 100644 --- a/patches/server/0173-Add-reason-to-potion-effect-add-event.patch +++ b/patches/server/0172-Add-reason-to-potion-effect-add-event.patch @@ -1,4 +1,4 @@ -From 8d2332e50ed6b4aaa49a49de8d19a3fb8e91bfa7 Mon Sep 17 00:00:00 2001 +From 97cac0596181a2c6a194b6733b446db6364cac7e Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Sun, 14 Apr 2019 16:11:30 -0500 Subject: [PATCH] Add reason to potion effect add event @@ -320,5 +320,5 @@ index 4351e304..f74d6654 100644 return success; } -- -2.20.1 +2.51.0 diff --git a/patches/server/0174-Add-world-generation-customization-API.patch b/patches/server/0173-Add-world-generation-customization-API.patch similarity index 99% rename from patches/server/0174-Add-world-generation-customization-API.patch rename to patches/server/0173-Add-world-generation-customization-API.patch index 31b191be0..1a237adf7 100644 --- a/patches/server/0174-Add-world-generation-customization-API.patch +++ b/patches/server/0173-Add-world-generation-customization-API.patch @@ -1,4 +1,4 @@ -From e97d36b00b596ad15793ac86f0d32bc19e77b8de Mon Sep 17 00:00:00 2001 +From 86f718523f71ad2cb7a694c2ae1ca32c08e6a584 Mon Sep 17 00:00:00 2001 From: Rafi Baum Date: Tue, 23 Apr 2019 17:32:11 -0400 Subject: [PATCH] Add world generation customization API @@ -290,5 +290,5 @@ index 7ffc5f5b..310ccac2 100644 IDataManager sdm = new ServerNBTManager(getWorldContainer(), name, true); WorldData worlddata = sdm.getWorldData(); -- -2.17.1 +2.51.0 diff --git a/patches/server/0175-Only-allow-login-events-after-plugins-are-loaded.patch b/patches/server/0174-Only-allow-login-events-after-plugins-are-loaded.patch similarity index 96% rename from patches/server/0175-Only-allow-login-events-after-plugins-are-loaded.patch rename to patches/server/0174-Only-allow-login-events-after-plugins-are-loaded.patch index 5f2b07539..b864a778b 100644 --- a/patches/server/0175-Only-allow-login-events-after-plugins-are-loaded.patch +++ b/patches/server/0174-Only-allow-login-events-after-plugins-are-loaded.patch @@ -1,4 +1,4 @@ -From e4b33487d199c6015c4cb575509e494220f0e544 Mon Sep 17 00:00:00 2001 +From 2a140bfa62ee1e92151cca761e6fd83ee5256762 Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Sat, 27 Apr 2019 11:45:53 -0700 Subject: [PATCH] Only allow login events after plugins are loaded @@ -51,7 +51,7 @@ index d2b51eed..1160f45e 100644 java.net.InetAddress address = ((java.net.InetSocketAddress) networkManager.getSocketAddress()).getAddress(); java.util.UUID uniqueId = i.getId(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fc26607a..b439dd22 100644 +index 61300499..e61380a1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -429,6 +429,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -63,5 +63,5 @@ index fc26607a..b439dd22 100644 protected void saveChunks(boolean flag) throws ExceptionWorldConflict { // CraftBukkit - added throws -- -2.20.1 +2.51.0 diff --git a/patches/server/0176-Use-fast-util-collections.patch b/patches/server/0175-Use-fast-util-collections.patch similarity index 97% rename from patches/server/0176-Use-fast-util-collections.patch rename to patches/server/0175-Use-fast-util-collections.patch index 5cbac94af..8594e4e4d 100644 --- a/patches/server/0176-Use-fast-util-collections.patch +++ b/patches/server/0175-Use-fast-util-collections.patch @@ -1,11 +1,11 @@ -From d7d1dc711e50369a0f48584f02cff732a400b7f8 Mon Sep 17 00:00:00 2001 +From 8647be0d5c385b9a832f5913aac694f4e5039c2e Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Sat, 27 Apr 2019 12:36:37 -0700 Subject: [PATCH] Use fast util collections diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 0602beac9..775cbd481 100644 +index 0602beac..775cbd48 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -27,18 +27,25 @@ import org.bukkit.event.world.ChunkUnloadEvent; @@ -88,7 +88,7 @@ index 0602beac9..775cbd481 100644 if (chunk == null) continue; unloadChunk(chunk); // SportPaper - Move to own method diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java -index dec091e73..f1e70d98d 100644 +index dec091e7..f1e70d98 100644 --- a/src/main/java/net/minecraft/server/DataWatcher.java +++ b/src/main/java/net/minecraft/server/DataWatcher.java @@ -10,18 +10,25 @@ import java.util.Map; @@ -151,7 +151,7 @@ index dec091e73..f1e70d98d 100644 for ( int i = 0; i < arraylist.size(); i++ ) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index e8cdce2aa..9a2508c81 100644 +index e8cdce2a..9a2508c8 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -404,7 +404,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -164,7 +164,7 @@ index e8cdce2aa..9a2508c81 100644 iter.remove(); continue; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e184d4168..34b232714 100644 +index e184d416..34b23271 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -281,7 +281,7 @@ public class CraftWorld implements World { @@ -204,5 +204,5 @@ index e184d4168..34b232714 100644 } -- -2.30.2 +2.51.0 diff --git a/patches/server/0177-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0176-Prevent-rayTrace-from-loading-chunks.patch similarity index 96% rename from patches/server/0177-Prevent-rayTrace-from-loading-chunks.patch rename to patches/server/0176-Prevent-rayTrace-from-loading-chunks.patch index 18db2e614..3ddd16a7d 100644 --- a/patches/server/0177-Prevent-rayTrace-from-loading-chunks.patch +++ b/patches/server/0176-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 9790f517a1720a99bdd68f068957e9e11a7d68fc Mon Sep 17 00:00:00 2001 +From 09958ab88d2a9553b50ed68df639b9cac7820b22 Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Sat, 27 Apr 2019 12:44:20 -0700 Subject: [PATCH] Prevent rayTrace from loading chunks @@ -29,5 +29,5 @@ index 0bb29ec7..3e5332f9 100644 if (!flag1 || block1.a(this, blockposition, iblockdata1) != null) { -- -2.20.1 +2.51.0 diff --git a/patches/server/0178-Rebrand-and-bump-version-to-1.8-SNAPSHOT.patch b/patches/server/0177-Rebrand-and-bump-version-to-1.8-SNAPSHOT.patch similarity index 95% rename from patches/server/0178-Rebrand-and-bump-version-to-1.8-SNAPSHOT.patch rename to patches/server/0177-Rebrand-and-bump-version-to-1.8-SNAPSHOT.patch index d84595849..ff6b55c8d 100644 --- a/patches/server/0178-Rebrand-and-bump-version-to-1.8-SNAPSHOT.patch +++ b/patches/server/0177-Rebrand-and-bump-version-to-1.8-SNAPSHOT.patch @@ -1,11 +1,11 @@ -From 6a9c45184ac58c56a97aca73c2e60646cf77863c Mon Sep 17 00:00:00 2001 +From b78620c1dca12ef247a1b8beab512a0fa419b3d1 Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Sat, 27 Apr 2019 15:28:42 -0700 Subject: [PATCH] Rebrand and bump version to 1.8-SNAPSHOT diff --git a/pom.xml b/pom.xml -index ee562d2e5..6a9d969e7 100644 +index 71681bf6..a2f665c1 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,9 @@ @@ -33,7 +33,7 @@ diff --git a/src/main/java/network/stratus/sportpaper/server/WorldGenSettingsMan similarity index 88% rename from src/main/java/network/stratus/sportpaper/server/WorldGenSettingsManager.java rename to src/main/java/app/ashcon/sportpaper/server/WorldGenSettingsManager.java -index 1933225e1..09dba14f9 100644 +index 1933225e..09dba14f 100644 --- a/src/main/java/network/stratus/sportpaper/server/WorldGenSettingsManager.java +++ b/src/main/java/app/ashcon/sportpaper/server/WorldGenSettingsManager.java @@ -1,11 +1,11 @@ @@ -52,7 +52,7 @@ index 1933225e1..09dba14f9 100644 * @author Rafi Baum */ diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java -index 4c011acf6..571aff2a8 100644 +index 4c011acf..571aff2a 100644 --- a/src/main/java/net/minecraft/server/WorldData.java +++ b/src/main/java/net/minecraft/server/WorldData.java @@ -2,8 +2,8 @@ package net.minecraft.server; @@ -67,7 +67,7 @@ index 4c011acf6..571aff2a8 100644 import org.bukkit.event.weather.ThunderChangeEvent; import org.bukkit.event.weather.WeatherChangeEvent; diff --git a/src/main/java/net/minecraft/server/WorldSettings.java b/src/main/java/net/minecraft/server/WorldSettings.java -index 0acf487df..faaab1735 100644 +index 0acf487d..faaab173 100644 --- a/src/main/java/net/minecraft/server/WorldSettings.java +++ b/src/main/java/net/minecraft/server/WorldSettings.java @@ -1,6 +1,6 @@ @@ -79,7 +79,7 @@ index 0acf487df..faaab1735 100644 public final class WorldSettings { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 310ccac21..b9e8e4f21 100644 +index 310ccac2..b9e8e4f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -27,7 +27,7 @@ import javax.imageio.ImageIO; @@ -127,7 +127,7 @@ index 310ccac21..b9e8e4f21 100644 import org.bukkit.permissions.Permission; import org.bukkit.plugin.IllegalPluginAccessException; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d358ea582..87cb3be2a 100644 +index 34b23271..913bfbed 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -15,7 +15,7 @@ import java.util.UUID; @@ -140,5 +140,5 @@ index d358ea582..87cb3be2a 100644 import org.bukkit.BlockChangeDelegate; import org.bukkit.Bukkit; -- -2.20.1 +2.51.0 diff --git a/patches/server/0179-Add-entity-ID-allocation-API.patch b/patches/server/0178-Add-entity-ID-allocation-API.patch similarity index 90% rename from patches/server/0179-Add-entity-ID-allocation-API.patch rename to patches/server/0178-Add-entity-ID-allocation-API.patch index e7d2593c4..fc2598e67 100644 --- a/patches/server/0179-Add-entity-ID-allocation-API.patch +++ b/patches/server/0178-Add-entity-ID-allocation-API.patch @@ -1,11 +1,11 @@ -From 7d2b2d55fc5464fffdc4a3c1581c1afb98c7c227 Mon Sep 17 00:00:00 2001 +From 4df8e489a05be0edc3f139b14b8d79ee71ba1fbf Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Mon, 29 Apr 2019 10:11:05 -0700 Subject: [PATCH] Add entity ID allocation API diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 70d70c038..9ab157cdc 100644 +index 70d70c03..9ab157cd 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -65,7 +65,7 @@ public abstract class Entity implements ICommandListener { @@ -18,7 +18,7 @@ index 70d70c038..9ab157cdc 100644 public double j; public boolean k; public boolean blocksEntitySpawning() { return k; } // Paper - OBFHELPER diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b9e8e4f21..613582cc4 100644 +index b9e8e4f2..613582cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1718,6 +1718,11 @@ public final class CraftServer implements Server { @@ -34,5 +34,5 @@ index b9e8e4f21..613582cc4 100644 public @Nullable Instant emptySince() { if(getOnlinePlayers().isEmpty()) { -- -2.20.1 +2.51.0 diff --git a/patches/server/0180-Expose-some-entity-packet-constructors.patch b/patches/server/0179-Expose-some-entity-packet-constructors.patch similarity index 96% rename from patches/server/0180-Expose-some-entity-packet-constructors.patch rename to patches/server/0179-Expose-some-entity-packet-constructors.patch index 6b9bfa54e..a34598abb 100644 --- a/patches/server/0180-Expose-some-entity-packet-constructors.patch +++ b/patches/server/0179-Expose-some-entity-packet-constructors.patch @@ -1,11 +1,11 @@ -From f0df719f64ca50f7f98047eefd9bc0a1d0f5a069 Mon Sep 17 00:00:00 2001 +From d6646db0c83fb1d2bcf7d226a99114b8e236cdb8 Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Mon, 29 Apr 2019 14:59:30 -0700 Subject: [PATCH] Expose some entity packet constructors diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index 6862cdd7c..fa5ca07e4 100644 +index 6862cdd7..fa5ca07e 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -4,7 +4,7 @@ import java.util.UUID; @@ -18,7 +18,7 @@ index 6862cdd7c..fa5ca07e4 100644 public UUID spawningEntity; // Paper diff --git a/src/main/java/net/minecraft/server/PacketPlayOutAttachEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutAttachEntity.java -index bf6f6643e..436d31fac 100644 +index bf6f6643..436d31fa 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutAttachEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutAttachEntity.java @@ -8,6 +8,14 @@ public class PacketPlayOutAttachEntity implements Packet @@ -45,7 +45,7 @@ index bf6f6643e..436d31fac 100644 - } } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutNamedEntitySpawn.java b/src/main/java/net/minecraft/server/PacketPlayOutNamedEntitySpawn.java -index 953d6ef53..1f2e8f5cf 100644 +index 953d6ef5..1f2e8f5c 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutNamedEntitySpawn.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutNamedEntitySpawn.java @@ -17,6 +17,19 @@ public class PacketPlayOutNamedEntitySpawn implements Packet Date: Tue, 30 Apr 2019 08:04:32 -0700 Subject: [PATCH] Mutable ChunkSnapshot API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java -index edf701be6..fab7df8dd 100644 +index edf701be..fab7df8d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java @@ -2,9 +2,14 @@ package org.bukkit.craftbukkit; @@ -101,5 +101,5 @@ index edf701be6..fab7df8dd 100644 + } } -- -2.20.1 +2.51.0 diff --git a/patches/server/0182-Add-willBeOnline-API.patch b/patches/server/0181-Add-willBeOnline-API.patch similarity index 94% rename from patches/server/0182-Add-willBeOnline-API.patch rename to patches/server/0181-Add-willBeOnline-API.patch index 83cedc85f..0df098567 100644 --- a/patches/server/0182-Add-willBeOnline-API.patch +++ b/patches/server/0181-Add-willBeOnline-API.patch @@ -1,11 +1,11 @@ -From ed5dbef3f88d2aa18d187d6b20d1b1255f58b82b Mon Sep 17 00:00:00 2001 +From d7fe2391c211cda678ed9642d525ae7713dcf23e Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Thu, 2 May 2019 15:46:23 -0700 Subject: [PATCH] Add willBeOnline API diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 9f1039012..d09f7453a 100644 +index 9f103901..d09f7453 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -366,6 +366,8 @@ public abstract class PlayerList { @@ -18,7 +18,7 @@ index 9f1039012..d09f7453a 100644 org.bukkit.craftbukkit.event.CraftEventFactory.handleInventoryCloseEvent(entityplayer); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -index 45217866b..b4ca64010 100644 +index 45217866..b4ca6401 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java @@ -43,6 +43,12 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa @@ -35,7 +35,7 @@ index 45217866b..b4ca64010 100644 Player player = getPlayer(); if (player != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 442c8119f..60c81cdc7 100644 +index e92e90f0..ff4236cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -89,6 +89,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -63,5 +63,5 @@ index 442c8119f..60c81cdc7 100644 if (getHandle().playerConnection == null) return null; -- -2.20.1 +2.51.0 diff --git a/patches/server/0183-Fix-NamedEntitySpawn-not-initializing-data-watcher.patch b/patches/server/0182-Fix-NamedEntitySpawn-not-initializing-data-watcher.patch similarity index 95% rename from patches/server/0183-Fix-NamedEntitySpawn-not-initializing-data-watcher.patch rename to patches/server/0182-Fix-NamedEntitySpawn-not-initializing-data-watcher.patch index 22b56ae2d..2284abfc3 100644 --- a/patches/server/0183-Fix-NamedEntitySpawn-not-initializing-data-watcher.patch +++ b/patches/server/0182-Fix-NamedEntitySpawn-not-initializing-data-watcher.patch @@ -1,4 +1,4 @@ -From ba3e486c1422ef23affb15fa17d16536b65f805a Mon Sep 17 00:00:00 2001 +From addc91fc52080f92038628fce107e213d20866fd Mon Sep 17 00:00:00 2001 From: David Rodriguez <15853933+limbo56@users.noreply.github.com> Date: Sun, 13 Oct 2019 19:21:28 -0400 Subject: [PATCH] Fix NamedEntitySpawn not initializing data watcher @@ -29,5 +29,5 @@ index 1f2e8f5c..67fc8b4f 100644 // SportPaper end public PacketPlayOutNamedEntitySpawn() {} -- -2.17.1 +2.51.0 diff --git a/patches/server/0184-Allow-plugins-to-append-custom-data-in-server-ping.patch b/patches/server/0183-Allow-plugins-to-append-custom-data-in-server-ping.patch similarity index 98% rename from patches/server/0184-Allow-plugins-to-append-custom-data-in-server-ping.patch rename to patches/server/0183-Allow-plugins-to-append-custom-data-in-server-ping.patch index aa8dd0afa..cc5a4b9c0 100644 --- a/patches/server/0184-Allow-plugins-to-append-custom-data-in-server-ping.patch +++ b/patches/server/0183-Allow-plugins-to-append-custom-data-in-server-ping.patch @@ -1,4 +1,4 @@ -From dd25fb04cc69c8cee8b15091c72d09ec4c523bc6 Mon Sep 17 00:00:00 2001 +From 7012d19d466b9feca0bfb0b8f529f0b847d6453d Mon Sep 17 00:00:00 2001 From: TheMolkaPL Date: Tue, 31 Dec 2019 03:07:18 +0100 Subject: [PATCH] Allow plugins to append custom data in server ping @@ -33,7 +33,7 @@ index e4bff04a..770fd53a 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java -index 034a559b..3f471702 100644 +index 04e23180..2756305e 100644 --- a/src/main/java/net/minecraft/server/ServerPing.java +++ b/src/main/java/net/minecraft/server/ServerPing.java @@ -12,12 +12,19 @@ import com.mojang.authlib.GameProfile; @@ -144,5 +144,5 @@ index 034a559b..3f471702 100644 } } -- -2.23.0.windows.1 +2.51.0 diff --git a/patches/server/0185-Speed-up-chunk-unloading.patch b/patches/server/0184-Speed-up-chunk-unloading.patch similarity index 97% rename from patches/server/0185-Speed-up-chunk-unloading.patch rename to patches/server/0184-Speed-up-chunk-unloading.patch index cc1cea7b2..4ff08c874 100644 --- a/patches/server/0185-Speed-up-chunk-unloading.patch +++ b/patches/server/0184-Speed-up-chunk-unloading.patch @@ -1,11 +1,11 @@ -From f9a6c374ab80d5f9f89777f72f718655b780f8d9 Mon Sep 17 00:00:00 2001 +From c2bdc998e27038ad51a9432b260e0d1ca32cc3ed Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Fri, 14 Feb 2020 18:11:36 -0600 Subject: [PATCH] Speed up chunk unloading diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 775cbd481..550d824e4 100644 +index 775cbd48..550d824e 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -1,28 +1,19 @@ @@ -123,7 +123,7 @@ index 775cbd481..550d824e4 100644 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 913bfbed7..cb97f4425 100644 +index 913bfbed..cb97f442 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -339,7 +339,6 @@ public class CraftWorld implements World { @@ -143,5 +143,5 @@ index 913bfbed7..cb97f4425 100644 } -- -2.30.2 +2.51.0 diff --git a/patches/server/0186-Remove-double-chunk-lookup.patch b/patches/server/0185-Remove-double-chunk-lookup.patch similarity index 92% rename from patches/server/0186-Remove-double-chunk-lookup.patch rename to patches/server/0185-Remove-double-chunk-lookup.patch index cee5f3cfc..7b6ae13b5 100644 --- a/patches/server/0186-Remove-double-chunk-lookup.patch +++ b/patches/server/0185-Remove-double-chunk-lookup.patch @@ -1,4 +1,4 @@ -From ff2f9cfedfc710f221187daffa7872d2c25d07f7 Mon Sep 17 00:00:00 2001 +From 3a3e03b737e586ee2a8bc2b89af589e6d784de64 Mon Sep 17 00:00:00 2001 From: "Maxwell C. West" Date: Wed, 22 Apr 2020 17:24:09 -0400 Subject: [PATCH] Remove double chunk lookup. @@ -23,5 +23,5 @@ index d3767d2a..82416a53 100644 } } -- -2.25.0.windows.1 +2.51.0 diff --git a/patches/server/0187-Fix-tick-loop-bug.patch b/patches/server/0186-Fix-tick-loop-bug.patch similarity index 93% rename from patches/server/0187-Fix-tick-loop-bug.patch rename to patches/server/0186-Fix-tick-loop-bug.patch index 334a51be1..3591395db 100644 --- a/patches/server/0187-Fix-tick-loop-bug.patch +++ b/patches/server/0186-Fix-tick-loop-bug.patch @@ -1,11 +1,11 @@ -From a3abdc4b6a0dd179b6fd6b90c5435578190da406 Mon Sep 17 00:00:00 2001 +From 1152e30891f131cf8e5f45fe7415565a04a9ab11 Mon Sep 17 00:00:00 2001 From: "Maxwell C. West" Date: Sun, 26 Apr 2020 22:55:33 -0400 Subject: [PATCH] Fix tick loop bug. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b439dd22..87bb6542 100644 +index e61380a1..513e2c36 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -683,21 +683,23 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -37,5 +37,5 @@ index b439dd22..87bb6542 100644 } -- -2.25.0.windows.1 +2.51.0 diff --git a/patches/server/0188-Implement-customizable-knockback-config-options-and-.patch b/patches/server/0187-Implement-customizable-knockback-config-options-and-.patch similarity index 99% rename from patches/server/0188-Implement-customizable-knockback-config-options-and-.patch rename to patches/server/0187-Implement-customizable-knockback-config-options-and-.patch index 726d61443..1ebe6de3b 100644 --- a/patches/server/0188-Implement-customizable-knockback-config-options-and-.patch +++ b/patches/server/0187-Implement-customizable-knockback-config-options-and-.patch @@ -1,4 +1,4 @@ -From dbb137978871386d0d0e4eb68c9b63734f9dd50e Mon Sep 17 00:00:00 2001 +From 9b951b13a941b307daa80a5e95466d5d70abdc2e Mon Sep 17 00:00:00 2001 From: Rafi Baum Date: Mon, 27 Apr 2020 18:25:50 -0400 Subject: [PATCH] Implement customizable knockback config options and command @@ -284,5 +284,5 @@ index 9360eac7..038137dc 100644 + } -- -2.17.1 +2.51.0 diff --git a/patches/server/0189-Fix-version-parse-location.patch b/patches/server/0188-Fix-version-parse-location.patch similarity index 92% rename from patches/server/0189-Fix-version-parse-location.patch rename to patches/server/0188-Fix-version-parse-location.patch index 51b709146..f3ef8e93e 100644 --- a/patches/server/0189-Fix-version-parse-location.patch +++ b/patches/server/0188-Fix-version-parse-location.patch @@ -1,4 +1,4 @@ -From 6a4fc550c524ab00748a28c60054dc1ae6a97287 Mon Sep 17 00:00:00 2001 +From 0a5d25facb899004398022bdc9de45fef83cf430 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Mon, 22 Jun 2020 11:40:12 -0500 Subject: [PATCH] Fix version parse location @@ -18,5 +18,5 @@ index 36bb612a..ccf0673b 100644 if (stream != null) { -- -2.23.0 +2.51.0 diff --git a/patches/server/0190-Add-option-to-remove-randomness-in-arrow-damage.patch b/patches/server/0189-Add-option-to-remove-randomness-in-arrow-damage.patch similarity index 95% rename from patches/server/0190-Add-option-to-remove-randomness-in-arrow-damage.patch rename to patches/server/0189-Add-option-to-remove-randomness-in-arrow-damage.patch index ebc1de864..4f8218893 100644 --- a/patches/server/0190-Add-option-to-remove-randomness-in-arrow-damage.patch +++ b/patches/server/0189-Add-option-to-remove-randomness-in-arrow-damage.patch @@ -1,4 +1,4 @@ -From 6fcc8bda02bc6cd0d7e27efba92817e21f66c00e Mon Sep 17 00:00:00 2001 +From a3eb0bc0b00e4bc7274aeea28a3aa7373821e33a Mon Sep 17 00:00:00 2001 From: Indicado Date: Wed, 15 Jul 2020 09:52:19 +0200 Subject: [PATCH] Add option to remove randomness in arrow damage @@ -34,5 +34,5 @@ index 038137dc..8d58d1f3 100644 private static void tickEmptyWorlds() { tickEmptyWorlds = getBoolean("settings.tick-empty-worlds", tickEmptyWorlds); -- -2.15.1.windows.2 +2.51.0 diff --git a/patches/server/0191-Prevent-1.7-players-glitching-in-carpet.patch b/patches/server/0190-Prevent-1.7-players-glitching-in-carpet.patch similarity index 94% rename from patches/server/0191-Prevent-1.7-players-glitching-in-carpet.patch rename to patches/server/0190-Prevent-1.7-players-glitching-in-carpet.patch index 38f85f972..cfa2ee27a 100644 --- a/patches/server/0191-Prevent-1.7-players-glitching-in-carpet.patch +++ b/patches/server/0190-Prevent-1.7-players-glitching-in-carpet.patch @@ -1,4 +1,4 @@ -From e4c81c3c462d9a6a7d236d11ebef83e4ae198d36 Mon Sep 17 00:00:00 2001 +From deac8c3b277ee0a54fc74725b3463fec0084a730 Mon Sep 17 00:00:00 2001 From: Pablete1234 Date: Sun, 9 Aug 2020 08:29:58 +0200 Subject: [PATCH] Prevent 1.7 players glitching in carpet @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent 1.7 players glitching in carpet Signed-off-by: Pablete1234 diff --git a/src/main/java/net/minecraft/server/BlockCarpet.java b/src/main/java/net/minecraft/server/BlockCarpet.java -index b34ff4341..b18bea110 100644 +index b34ff434..b18bea11 100644 --- a/src/main/java/net/minecraft/server/BlockCarpet.java +++ b/src/main/java/net/minecraft/server/BlockCarpet.java @@ -1,5 +1,7 @@ @@ -39,7 +39,7 @@ index b34ff4341..b18bea110 100644 public boolean canPlace(World world, BlockPosition blockposition) { return super.canPlace(world, blockposition) && this.e(world, blockposition); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 51fd9d4b3..0e68599d1 100644 +index 51fd9d4b..0e68599d 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1817,6 +1817,23 @@ public abstract class EntityHuman extends EntityLiving { @@ -67,5 +67,5 @@ index 51fd9d4b3..0e68599d1 100644 static final int[] a = new int[EnumDirection.values().length]; -- -2.15.1.windows.2 +2.51.0 diff --git a/patches/server/0192-Fire-block-place-sounds-inside-event-logic-chain.patch b/patches/server/0191-Fire-block-place-sounds-inside-event-logic-chain.patch similarity index 97% rename from patches/server/0192-Fire-block-place-sounds-inside-event-logic-chain.patch rename to patches/server/0191-Fire-block-place-sounds-inside-event-logic-chain.patch index ab9cac092..e6f77dbbc 100644 --- a/patches/server/0192-Fire-block-place-sounds-inside-event-logic-chain.patch +++ b/patches/server/0191-Fire-block-place-sounds-inside-event-logic-chain.patch @@ -1,4 +1,4 @@ -From 7416a303a8a65d7656d0f4dca57ba17a52fdb0ac Mon Sep 17 00:00:00 2001 +From 9e8fad240ac1f525491eb665d5dd27d7fdaf5d10 Mon Sep 17 00:00:00 2001 From: Austin Mayes Date: Mon, 26 Oct 2020 21:02:04 -0500 Subject: [PATCH] Fire block place sounds inside event logic chain @@ -38,5 +38,5 @@ index 55be2b71..92657b61 100644 } } -- -2.50.0 +2.51.0 diff --git a/patches/server/0193-Make-unknown-and-internal-command-messages-customisa.patch b/patches/server/0192-Make-unknown-and-internal-command-messages-customisa.patch similarity index 98% rename from patches/server/0193-Make-unknown-and-internal-command-messages-customisa.patch rename to patches/server/0192-Make-unknown-and-internal-command-messages-customisa.patch index fb87e53b8..4a0606537 100644 --- a/patches/server/0193-Make-unknown-and-internal-command-messages-customisa.patch +++ b/patches/server/0192-Make-unknown-and-internal-command-messages-customisa.patch @@ -1,4 +1,4 @@ -From 950e920f95c5399732e7106022222cc34ef7ffbd Mon Sep 17 00:00:00 2001 +From f0d517703cc4009ff77085fa77d934dede6fb194 Mon Sep 17 00:00:00 2001 From: VytskaLT Date: Fri, 4 Dec 2020 13:56:51 +0200 Subject: [PATCH] Make unknown and internal command messages customisable in @@ -91,5 +91,5 @@ index ec995293..2b9358b2 100644 outdatedClientMessage = transform( getString( "messages.outdated-client", outdatedClientMessage ) ); outdatedServerMessage = transform( getString( "messages.outdated-server", outdatedServerMessage ) ); -- -2.25.1 +2.51.0 diff --git a/patches/server/0194-Update-MySQL-Connector.patch b/patches/server/0193-Update-MySQL-Connector.patch similarity index 88% rename from patches/server/0194-Update-MySQL-Connector.patch rename to patches/server/0193-Update-MySQL-Connector.patch index 64e83f5d5..31ddcfc7c 100644 --- a/patches/server/0194-Update-MySQL-Connector.patch +++ b/patches/server/0193-Update-MySQL-Connector.patch @@ -1,4 +1,4 @@ -From ef4ce39e89a038ec0d39e8f238dfc6d333d25a33 Mon Sep 17 00:00:00 2001 +From 0f81350bd100413ec78dd3b927ef42090a59eece Mon Sep 17 00:00:00 2001 From: VytskaLT Date: Tue, 15 Dec 2020 18:59:08 +0200 Subject: [PATCH] Update MySQL Connector @@ -18,5 +18,5 @@ index a2f665c1..d8e35ef2 100644 compile -- -2.50.0 +2.51.0 diff --git a/patches/server/0195-Don-t-store-merchant-recipes-with-invalid-data.patch b/patches/server/0194-Don-t-store-merchant-recipes-with-invalid-data.patch similarity index 92% rename from patches/server/0195-Don-t-store-merchant-recipes-with-invalid-data.patch rename to patches/server/0194-Don-t-store-merchant-recipes-with-invalid-data.patch index 52091936b..a6819426b 100644 --- a/patches/server/0195-Don-t-store-merchant-recipes-with-invalid-data.patch +++ b/patches/server/0194-Don-t-store-merchant-recipes-with-invalid-data.patch @@ -1,4 +1,4 @@ -From 708ee86d1712a62f3850136903ec5487ebeda5ac Mon Sep 17 00:00:00 2001 +From b6b61d628b8cb837e3d976f96cf264b5036633eb Mon Sep 17 00:00:00 2001 From: Austin L Mayes Date: Mon, 21 Dec 2020 17:08:28 -0600 Subject: [PATCH] Don't store merchant recipes with invalid data @@ -19,5 +19,5 @@ index 3dd22559..3e4d5ed1 100644 } -- -2.25.1 +2.51.0 diff --git a/patches/server/0196-Add-Json-display-name-to-PacketPlayOutPlayerInfo.patch b/patches/server/0195-Add-Json-display-name-to-PacketPlayOutPlayerInfo.patch similarity index 97% rename from patches/server/0196-Add-Json-display-name-to-PacketPlayOutPlayerInfo.patch rename to patches/server/0195-Add-Json-display-name-to-PacketPlayOutPlayerInfo.patch index 8fc89c6a2..40800143e 100644 --- a/patches/server/0196-Add-Json-display-name-to-PacketPlayOutPlayerInfo.patch +++ b/patches/server/0195-Add-Json-display-name-to-PacketPlayOutPlayerInfo.patch @@ -1,4 +1,4 @@ -From 3e00213a4732250411835196bd6925abcc5e7eda Mon Sep 17 00:00:00 2001 +From 4747d63cfa0f9b867641752ee7f9a89161c36d33 Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 6 Apr 2021 15:53:58 -0700 Subject: [PATCH] Add Json display name to PacketPlayOutPlayerInfo @@ -44,5 +44,5 @@ index 2d699afa..65bdeefb 100644 private final int b; private final WorldSettings.EnumGamemode c; -- -2.30.0 +2.51.0 diff --git a/patches/server/0197-Expose-client-disconnect-reason.patch b/patches/server/0196-Expose-client-disconnect-reason.patch similarity index 97% rename from patches/server/0197-Expose-client-disconnect-reason.patch rename to patches/server/0196-Expose-client-disconnect-reason.patch index 0c6fa1b3b..4cb78598d 100644 --- a/patches/server/0197-Expose-client-disconnect-reason.patch +++ b/patches/server/0196-Expose-client-disconnect-reason.patch @@ -1,4 +1,4 @@ -From b1071fc494ccf9a11b7ccb712e4d884ddb42b11d Mon Sep 17 00:00:00 2001 +From 91102406c3f7653379e2df44af5770b613659f3b Mon Sep 17 00:00:00 2001 From: Austin L Mayes Date: Wed, 17 Feb 2021 16:37:59 -0600 Subject: [PATCH] Expose client disconnect reason @@ -6,7 +6,7 @@ Subject: [PATCH] Expose client disconnect reason Signed-off-by: Austin L Mayes diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5267250ab..5e903d405 100644 +index 5267250a..5e903d40 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -722,7 +722,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList @@ -28,7 +28,7 @@ index 5267250ab..5e903d405 100644 this.minecraftServer.getPlayerList().sendMessage(CraftChatMessage.fromString(quitMessage)); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index d09f7453a..cb6a3be08 100644 +index d09f7453..cb6a3be0 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -75,7 +75,7 @@ public abstract class PlayerList { @@ -99,5 +99,5 @@ index d09f7453a..cb6a3be08 100644 entityplayer1.copyTo(entityplayer, flag); entityplayer1.d(entityplayer.getId()); -- -2.30.2 +2.51.0 diff --git a/patches/server/0198-Optimize-head-rotation-patch.patch b/patches/server/0197-Optimize-head-rotation-patch.patch similarity index 94% rename from patches/server/0198-Optimize-head-rotation-patch.patch rename to patches/server/0197-Optimize-head-rotation-patch.patch index b14f02f13..4d64e3327 100644 --- a/patches/server/0198-Optimize-head-rotation-patch.patch +++ b/patches/server/0197-Optimize-head-rotation-patch.patch @@ -1,11 +1,11 @@ -From afec0bfb455a7c31afc56d3f23958a468f7d06d2 Mon Sep 17 00:00:00 2001 +From c9b011d2897183e11e74a69159bd735ce2585c84 Mon Sep 17 00:00:00 2001 From: RoccoDev Date: Fri, 19 Mar 2021 16:55:19 +0100 Subject: [PATCH] Optimize head rotation patch diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 5fda01c3d..45d611f34 100644 +index 5fda01c3..45d611f3 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -411,9 +411,15 @@ public class EntityTrackerEntry { @@ -27,5 +27,5 @@ index 5fda01c3d..45d611f34 100644 // CraftBukkit end -- -2.30.2 +2.51.0 diff --git a/patches/server/0199-Limit-CraftChatMessage-iterations.patch b/patches/server/0198-Limit-CraftChatMessage-iterations.patch similarity index 94% rename from patches/server/0199-Limit-CraftChatMessage-iterations.patch rename to patches/server/0198-Limit-CraftChatMessage-iterations.patch index 39b56a940..b33297d61 100644 --- a/patches/server/0199-Limit-CraftChatMessage-iterations.patch +++ b/patches/server/0198-Limit-CraftChatMessage-iterations.patch @@ -1,4 +1,4 @@ -From 9b950b8a7ec886c8b610c92c1002fd0b4e91e464 Mon Sep 17 00:00:00 2001 +From 280a58d9334be7e64cd594fa3ff95f3f4ce2e8f1 Mon Sep 17 00:00:00 2001 From: VytskaLT Date: Sat, 17 Apr 2021 10:28:37 +0300 Subject: [PATCH] Limit CraftChatMessage iterations @@ -25,5 +25,5 @@ index 38ef8216..a68d9e38 100644 out.append(modi.getColor() == null ? defaultColor : modi.getColor()); if (modi.isBold()) { -- -2.17.1 +2.51.0 diff --git a/patches/server/0200-Don-t-use-force-unload-for-keep-spawn-setting-change.patch b/patches/server/0199-Don-t-use-force-unload-for-keep-spawn-setting-change.patch similarity index 91% rename from patches/server/0200-Don-t-use-force-unload-for-keep-spawn-setting-change.patch rename to patches/server/0199-Don-t-use-force-unload-for-keep-spawn-setting-change.patch index aad89d9e7..269d576fa 100644 --- a/patches/server/0200-Don-t-use-force-unload-for-keep-spawn-setting-change.patch +++ b/patches/server/0199-Don-t-use-force-unload-for-keep-spawn-setting-change.patch @@ -1,4 +1,4 @@ -From 224ee0b08135d88149025a4cabaed906c165d312 Mon Sep 17 00:00:00 2001 +From f76dca052af5b778493fee0985e291c2ce3b3f3d Mon Sep 17 00:00:00 2001 From: VytskaLT Date: Sat, 17 Apr 2021 10:39:04 +0300 Subject: [PATCH] Don't use force unload for keep spawn setting change @@ -18,5 +18,5 @@ index cb97f442..2c66dbee 100644 public boolean unloadChunk(int x, int z, boolean save) { -- -2.17.1 +2.51.0 diff --git a/patches/server/0201-Cache-block-break-animation-packet.patch b/patches/server/0200-Cache-block-break-animation-packet.patch similarity index 95% rename from patches/server/0201-Cache-block-break-animation-packet.patch rename to patches/server/0200-Cache-block-break-animation-packet.patch index 40d02906f..2891c5a75 100644 --- a/patches/server/0201-Cache-block-break-animation-packet.patch +++ b/patches/server/0200-Cache-block-break-animation-packet.patch @@ -1,4 +1,4 @@ -From 8be77f9683553faea27230ae2aac139e57b14feb Mon Sep 17 00:00:00 2001 +From 672fc916ecbb6fbd9ce959c298209702e01fc9d0 Mon Sep 17 00:00:00 2001 From: VytskaLT Date: Sat, 17 Apr 2021 10:43:08 +0300 Subject: [PATCH] Cache block break animation packet @@ -29,5 +29,5 @@ index 55a2112d..1acae40d 100644 } } -- -2.17.1 +2.51.0 diff --git a/patches/server/0202-Always-delete-UserCache-on-error.patch b/patches/server/0201-Always-delete-UserCache-on-error.patch similarity index 94% rename from patches/server/0202-Always-delete-UserCache-on-error.patch rename to patches/server/0201-Always-delete-UserCache-on-error.patch index c87731d2d..7cb20a92a 100644 --- a/patches/server/0202-Always-delete-UserCache-on-error.patch +++ b/patches/server/0201-Always-delete-UserCache-on-error.patch @@ -1,4 +1,4 @@ -From a1899f8ca5efeb1ad3382f8915f52359e7f4f6e3 Mon Sep 17 00:00:00 2001 +From 297ffcd50e7903db8fae55863ebb4850145fc226 Mon Sep 17 00:00:00 2001 From: linsaftw Date: Tue, 27 Apr 2021 10:26:42 -0300 Subject: [PATCH] Always delete UserCache on error @@ -27,5 +27,5 @@ index c3bdb881..700c6069 100644 IOUtils.closeQuietly(bufferedreader); } -- -2.17.1 +2.51.0 diff --git a/patches/server/0203-Fix-EntityKnockbackByEntityEvent.patch b/patches/server/0202-Fix-EntityKnockbackByEntityEvent.patch similarity index 98% rename from patches/server/0203-Fix-EntityKnockbackByEntityEvent.patch rename to patches/server/0202-Fix-EntityKnockbackByEntityEvent.patch index 107899d5e..ac12b2c2c 100644 --- a/patches/server/0203-Fix-EntityKnockbackByEntityEvent.patch +++ b/patches/server/0202-Fix-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From 8d3944580a423481318a750ae508648b200dde7e Mon Sep 17 00:00:00 2001 +From 7f29381d5e14e94e8c58ea15ee8d1eea590d2ac8 Mon Sep 17 00:00:00 2001 From: VytskaLT Date: Sat, 17 Apr 2021 19:20:22 +0300 Subject: [PATCH] Fix EntityKnockbackByEntityEvent @@ -111,5 +111,5 @@ index b7d410ee..0d6ccbf7 100644 } } -- -2.17.1 +2.51.0 diff --git a/patches/server/0204-Fix-Teleport-Invisibility.patch b/patches/server/0203-Fix-Teleport-Invisibility.patch similarity index 95% rename from patches/server/0204-Fix-Teleport-Invisibility.patch rename to patches/server/0203-Fix-Teleport-Invisibility.patch index 9165c9813..ec9f432f2 100644 --- a/patches/server/0204-Fix-Teleport-Invisibility.patch +++ b/patches/server/0203-Fix-Teleport-Invisibility.patch @@ -1,4 +1,4 @@ -From 1f6664eb3b14f26931b4fc73be508b64a0c5d11f Mon Sep 17 00:00:00 2001 +From 6d3e594a57034449345e5169fc4ce9561d431185 Mon Sep 17 00:00:00 2001 From: linsaftw Date: Sun, 25 Apr 2021 17:33:56 -0300 Subject: [PATCH] Fix Teleport Invisibility @@ -30,5 +30,5 @@ index 45d611f3..97fbf0ea 100644 // CraftBukkit end object = new PacketPlayOutEntityTeleport(this.tracker.getId(), i, j, k, (byte) l, (byte) i1, this.tracker.onGround); -- -2.17.1 +2.51.0 diff --git a/patches/server/0205-Fix-getPlayer-not-respecting-viewer-when-looking-for.patch b/patches/server/0204-Fix-getPlayer-not-respecting-viewer-when-looking-for.patch similarity index 92% rename from patches/server/0205-Fix-getPlayer-not-respecting-viewer-when-looking-for.patch rename to patches/server/0204-Fix-getPlayer-not-respecting-viewer-when-looking-for.patch index 216196b2f..3b4825fb5 100644 --- a/patches/server/0205-Fix-getPlayer-not-respecting-viewer-when-looking-for.patch +++ b/patches/server/0204-Fix-getPlayer-not-respecting-viewer-when-looking-for.patch @@ -1,4 +1,4 @@ -From 96de1b7ec06d7843bbcc452ec5a6a9dbf928ce9d Mon Sep 17 00:00:00 2001 +From e01664bd6ab300d47bf96a2c7a4a43b28e193578 Mon Sep 17 00:00:00 2001 From: William Jeffcock Date: Sat, 28 Aug 2021 23:32:33 +0100 Subject: [PATCH] Fix getPlayer not respecting viewer when looking for an exact @@ -19,5 +19,5 @@ index c90241cd..52b2d106 100644 if (found != null) { return found; -- -2.17.1 +2.51.0 diff --git a/patches/server/0206-Add-API-for-custom-format-loaders.patch b/patches/server/0205-Add-API-for-custom-format-loaders.patch similarity index 99% rename from patches/server/0206-Add-API-for-custom-format-loaders.patch rename to patches/server/0205-Add-API-for-custom-format-loaders.patch index fff996eb9..01ba08e7d 100644 --- a/patches/server/0206-Add-API-for-custom-format-loaders.patch +++ b/patches/server/0205-Add-API-for-custom-format-loaders.patch @@ -1,4 +1,4 @@ -From 23260df35df06d1fcecfbb13454e3c1961afc264 Mon Sep 17 00:00:00 2001 +From 9895a1126a9c9b071318af33428eddaefbd5c031 Mon Sep 17 00:00:00 2001 From: William Jeffcock Date: Thu, 23 Sep 2021 01:11:33 +0100 Subject: [PATCH] Add API for custom format loaders @@ -334,5 +334,5 @@ index 00000000..5bac0f05 + +} -- -2.34.1 +2.51.0 diff --git a/patches/server/0207-Optimize-toLegacyData-removing-sanity-checks.patch b/patches/server/0206-Optimize-toLegacyData-removing-sanity-checks.patch similarity index 88% rename from patches/server/0207-Optimize-toLegacyData-removing-sanity-checks.patch rename to patches/server/0206-Optimize-toLegacyData-removing-sanity-checks.patch index 28e2044f2..9eae3b223 100644 --- a/patches/server/0207-Optimize-toLegacyData-removing-sanity-checks.patch +++ b/patches/server/0206-Optimize-toLegacyData-removing-sanity-checks.patch @@ -1,11 +1,11 @@ -From cd150cc85ecdde1c9484693596911180a34c7d8c Mon Sep 17 00:00:00 2001 +From 7b90a8e2fb6b7c68343c9e75565ceef5fea91fbd Mon Sep 17 00:00:00 2001 From: Pablete1234 Date: Sun, 5 Dec 2021 06:18:48 +0100 Subject: [PATCH] Optimize toLegacyData removing sanity checks diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index db09989eb..874af8a32 100644 +index db09989e..874af8a3 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -158,11 +158,7 @@ public class Block { @@ -22,5 +22,5 @@ index db09989eb..874af8a32 100644 public IBlockData updateState(IBlockData iblockdata, IBlockAccess iblockaccess, BlockPosition blockposition) { -- -2.32.0.windows.2 +2.51.0 diff --git a/patches/server/0208-Fix-chunk-unloading.patch b/patches/server/0207-Fix-chunk-unloading.patch similarity index 94% rename from patches/server/0208-Fix-chunk-unloading.patch rename to patches/server/0207-Fix-chunk-unloading.patch index 546cd6ef6..8ecfc6118 100644 --- a/patches/server/0208-Fix-chunk-unloading.patch +++ b/patches/server/0207-Fix-chunk-unloading.patch @@ -1,4 +1,4 @@ -From c3f8a64344bff6a1cc78d0a9ad170a3254f53127 Mon Sep 17 00:00:00 2001 +From 062ffcb8edb2171f2f8080ed5ca7619de9135dd6 Mon Sep 17 00:00:00 2001 From: applenick Date: Wed, 29 Dec 2021 16:09:42 -0800 Subject: [PATCH] Fix chunk unloading @@ -27,5 +27,5 @@ index 550d824e..812686d5 100644 public IChunkProvider chunkProvider; private IChunkLoader chunkLoader; -- -2.50.0 +2.51.0 diff --git a/patches/server/0209-Add-events-for-water-source-creation.patch b/patches/server/0208-Add-events-for-water-source-creation.patch similarity index 98% rename from patches/server/0209-Add-events-for-water-source-creation.patch rename to patches/server/0208-Add-events-for-water-source-creation.patch index ee9f0bdb6..d403bfac3 100644 --- a/patches/server/0209-Add-events-for-water-source-creation.patch +++ b/patches/server/0208-Add-events-for-water-source-creation.patch @@ -1,4 +1,4 @@ -From 55881638d6be1b199750687e0eae2f060723d195 Mon Sep 17 00:00:00 2001 +From fd6c18f38164bd65e277b47ebbd2def1f790fb5d Mon Sep 17 00:00:00 2001 From: OhPointFive Date: Thu, 7 Jul 2022 00:33:31 -0400 Subject: [PATCH] Add events for water source creation @@ -80,5 +80,5 @@ index be8bb5be..cc4d7319 100644 world.setAir(blockposition); } else { -- -2.50.0 +2.51.0 diff --git a/patches/server/0210-Apply-explosion-knockback-to-projectiles.patch b/patches/server/0209-Apply-explosion-knockback-to-projectiles.patch similarity index 95% rename from patches/server/0210-Apply-explosion-knockback-to-projectiles.patch rename to patches/server/0209-Apply-explosion-knockback-to-projectiles.patch index b82ec0dd8..2cb722238 100644 --- a/patches/server/0210-Apply-explosion-knockback-to-projectiles.patch +++ b/patches/server/0209-Apply-explosion-knockback-to-projectiles.patch @@ -1,4 +1,4 @@ -From 6d52b135af7093ac872627ccca6b8e14cba8da05 Mon Sep 17 00:00:00 2001 +From d3afb3dbe800ed09efd467c03b9587116b1622a3 Mon Sep 17 00:00:00 2001 From: woofdoggo Date: Wed, 11 May 2022 16:49:54 -0400 Subject: [PATCH] Apply explosion knockback to projectiles @@ -23,5 +23,5 @@ index 0d6ccbf7..e90b1c23 100644 double d14 = entity instanceof EntityHuman && world.paperSpigotConfig.disableExplosionKnockback ? 0 : EnchantmentProtection.a(entity, d13); // PaperSpigot -- -2.50.0 +2.51.0 diff --git a/patches/server/0211-Patch-Book-Exploits.patch b/patches/server/0210-Patch-Book-Exploits.patch similarity index 98% rename from patches/server/0211-Patch-Book-Exploits.patch rename to patches/server/0210-Patch-Book-Exploits.patch index 89a5b5fd1..d73bbede7 100644 --- a/patches/server/0211-Patch-Book-Exploits.patch +++ b/patches/server/0210-Patch-Book-Exploits.patch @@ -1,4 +1,4 @@ -From 25d6b50e7ed5f93408238d455c7d240e607fd3d4 Mon Sep 17 00:00:00 2001 +From 4250d745fe0ebc3835ccd34efb2e7ce1026eab19 Mon Sep 17 00:00:00 2001 From: linsaftw Date: Sun, 25 Apr 2021 11:53:18 -0300 Subject: [PATCH] Patch Book Exploits @@ -148,5 +148,5 @@ index 0b5ada01..4175501d 100644 private boolean isValidPage(int page) { -- -2.50.0 +2.51.0 diff --git a/patches/server/0212-Update-to-Netty-4.1.118.patch b/patches/server/0211-Update-to-Netty-4.1.118.patch similarity index 99% rename from patches/server/0212-Update-to-Netty-4.1.118.patch rename to patches/server/0211-Update-to-Netty-4.1.118.patch index 61b0632bd..cecd8447d 100644 --- a/patches/server/0212-Update-to-Netty-4.1.118.patch +++ b/patches/server/0211-Update-to-Netty-4.1.118.patch @@ -1,4 +1,4 @@ -From 3f47e449dda883c211475e9924be1492d20ac99b Mon Sep 17 00:00:00 2001 +From 1f2edb5f7a98eaff352ebbf478bd5cd3e41b7e40 Mon Sep 17 00:00:00 2001 From: hpfxd Date: Wed, 27 Oct 2021 06:29:44 -0400 Subject: [PATCH] Update to Netty 4.1.118 @@ -324,5 +324,5 @@ index e2eb3054..9a075fef 100644 + // SportPaper end } -- -2.50.0 +2.51.0 diff --git a/patches/server/0213-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0212-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 95% rename from patches/server/0213-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0212-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index c439e5bed..cf2df4a29 100644 --- a/patches/server/0213-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/server/0212-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -1,4 +1,4 @@ -From 11628b5e8bc8e45a9259bc18452ba1830dfd40dd Mon Sep 17 00:00:00 2001 +From 9a2079cac0f20779273d36490b32a35a5aaffb38 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 31 Oct 2021 09:46:32 -0400 Subject: [PATCH] Set cap on JDK per-thread native byte buffer cache @@ -29,5 +29,5 @@ index d1ce7a86..737904d4 100644 { acceptsAll(asList("?", "help"), "Show the help"); -- -2.50.0 +2.51.0 diff --git a/patches/server/0214-Prevent-desync-with-some-packets-that-use-entity-id-.patch b/patches/server/0213-Prevent-desync-with-some-packets-that-use-entity-id-.patch similarity index 93% rename from patches/server/0214-Prevent-desync-with-some-packets-that-use-entity-id-.patch rename to patches/server/0213-Prevent-desync-with-some-packets-that-use-entity-id-.patch index e16811f26..c631c4738 100644 --- a/patches/server/0214-Prevent-desync-with-some-packets-that-use-entity-id-.patch +++ b/patches/server/0213-Prevent-desync-with-some-packets-that-use-entity-id-.patch @@ -1,4 +1,4 @@ -From 94e6ab0c4157a9752098f057494412fb20a2af0c Mon Sep 17 00:00:00 2001 +From febb98273cdd115b1a3183c7dc91316aeffa09b7 Mon Sep 17 00:00:00 2001 From: theFoxley <7950977+theFoxley@users.noreply.github.com> Date: Sat, 21 Jan 2023 22:54:41 +0100 Subject: [PATCH] Prevent desync with some packets that use entity id and check @@ -20,5 +20,5 @@ index 9ab157cd..0d95a296 100644 public double j; public boolean k; public boolean blocksEntitySpawning() { return k; } // Paper - OBFHELPER -- -2.50.0 +2.51.0 diff --git a/patches/server/0215-Resolve-build-issues-with-Java-17.patch b/patches/server/0214-Resolve-build-issues-with-Java-17.patch similarity index 96% rename from patches/server/0215-Resolve-build-issues-with-Java-17.patch rename to patches/server/0214-Resolve-build-issues-with-Java-17.patch index 0621534a9..a101f3594 100644 --- a/patches/server/0215-Resolve-build-issues-with-Java-17.patch +++ b/patches/server/0214-Resolve-build-issues-with-Java-17.patch @@ -1,4 +1,4 @@ -From 91bff9166c187ff003d0d6037026a421df907c50 Mon Sep 17 00:00:00 2001 +From 14d9fefb247337d6047747159f7b8be0b9b26717 Mon Sep 17 00:00:00 2001 From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com> Date: Mon, 6 Feb 2023 23:30:48 -0800 Subject: [PATCH] Resolve build issues with Java 17 @@ -46,5 +46,5 @@ index 2a02fbcb..f38265d6 100644 org.apache.maven.plugins -- -2.50.0 +2.51.0 diff --git a/patches/server/0216-Add-setting-to-check-line-of-sight.patch b/patches/server/0215-Add-setting-to-check-line-of-sight.patch similarity index 95% rename from patches/server/0216-Add-setting-to-check-line-of-sight.patch rename to patches/server/0215-Add-setting-to-check-line-of-sight.patch index 7388effe6..08d936c75 100644 --- a/patches/server/0216-Add-setting-to-check-line-of-sight.patch +++ b/patches/server/0215-Add-setting-to-check-line-of-sight.patch @@ -1,4 +1,4 @@ -From 5d8c30c1395a04e3c88d0d7695e50f8fc4f7f5b0 Mon Sep 17 00:00:00 2001 +From e5accc3ed834f8b5ed53c7b76902d0467e40018a Mon Sep 17 00:00:00 2001 From: halfmaster1 Date: Wed, 5 May 2021 02:20:01 -0400 Subject: [PATCH] Add setting to check line of sight @@ -32,5 +32,5 @@ index 8d58d1f3..ca028d04 100644 + } -- -2.50.0 +2.51.0 diff --git a/patches/server/0217-Make-critical-hits-configurable.patch b/patches/server/0216-Make-critical-hits-configurable.patch similarity index 95% rename from patches/server/0217-Make-critical-hits-configurable.patch rename to patches/server/0216-Make-critical-hits-configurable.patch index 34c2aa112..c86aa34fd 100644 --- a/patches/server/0217-Make-critical-hits-configurable.patch +++ b/patches/server/0216-Make-critical-hits-configurable.patch @@ -1,4 +1,4 @@ -From fd36fc0ecc54c435937b2a09e3227d1a6d2d1e3d Mon Sep 17 00:00:00 2001 +From 8673de2e326468efc396168d5d297396aea7a970 Mon Sep 17 00:00:00 2001 From: halfmaster1 Date: Tue, 18 May 2021 04:28:46 -0400 Subject: [PATCH] Make critical hits configurable @@ -32,5 +32,5 @@ index ca028d04..8cdcaf3a 100644 + } -- -2.50.0 +2.51.0 diff --git a/patches/server/0218-Optimize-networking-by-using-IP_TOS.patch b/patches/server/0217-Optimize-networking-by-using-IP_TOS.patch similarity index 93% rename from patches/server/0218-Optimize-networking-by-using-IP_TOS.patch rename to patches/server/0217-Optimize-networking-by-using-IP_TOS.patch index 0dca39604..967247690 100644 --- a/patches/server/0218-Optimize-networking-by-using-IP_TOS.patch +++ b/patches/server/0217-Optimize-networking-by-using-IP_TOS.patch @@ -1,4 +1,4 @@ -From 0473d6807b44d8b79771a8d37c6098963bf2925f Mon Sep 17 00:00:00 2001 +From 92a46b43cae9b98b313e7eb89cab1fecf2e9ddc4 Mon Sep 17 00:00:00 2001 From: Heath Logan Campbell Date: Fri, 31 Jul 2020 12:43:00 +0200 Subject: [PATCH] Optimize networking by using IP_TOS @@ -18,5 +18,5 @@ index cc6f993b..052139d4 100644 ; } -- -2.50.0 +2.51.0 diff --git a/patches/server/0219-Fix-east-west-cannoning.patch b/patches/server/0218-Fix-east-west-cannoning.patch similarity index 97% rename from patches/server/0219-Fix-east-west-cannoning.patch rename to patches/server/0218-Fix-east-west-cannoning.patch index 627faf7d9..f35b136fd 100644 --- a/patches/server/0219-Fix-east-west-cannoning.patch +++ b/patches/server/0218-Fix-east-west-cannoning.patch @@ -1,4 +1,4 @@ -From 9a88115fc24f0b63898f0b617e00c541cee10152 Mon Sep 17 00:00:00 2001 +From 93893ed8325204e7b71bc0783f8bde11ea8dc930 Mon Sep 17 00:00:00 2001 From: AmbrosL Date: Sat, 10 Mar 2018 02:33:28 +0100 Subject: [PATCH] Fix east/west cannoning @@ -54,5 +54,5 @@ index 0d95a296..f9d7e660 100644 double d10 = d0; double d11 = d1; -- -2.50.0 +2.51.0 diff --git a/patches/server/0220-Remove-hacky-stackable-buckets-code.patch b/patches/server/0219-Remove-hacky-stackable-buckets-code.patch similarity index 97% rename from patches/server/0220-Remove-hacky-stackable-buckets-code.patch rename to patches/server/0219-Remove-hacky-stackable-buckets-code.patch index 2aee1931d..ab922635c 100644 --- a/patches/server/0220-Remove-hacky-stackable-buckets-code.patch +++ b/patches/server/0219-Remove-hacky-stackable-buckets-code.patch @@ -1,4 +1,4 @@ -From d365bf1ede9458d12365ef857c6f1280c9f475dd Mon Sep 17 00:00:00 2001 +From 898bd376fc6d8352e5149167bbdf7eb88ef6dfdc Mon Sep 17 00:00:00 2001 From: hpfxd Date: Wed, 27 Oct 2021 20:46:41 -0400 Subject: [PATCH] Remove hacky stackable buckets code @@ -65,5 +65,5 @@ index 8cdcaf3a..065dcdf6 100644 public static boolean warnForExcessiveVelocity; -- -2.50.0 +2.51.0 diff --git a/patches/server/0221-Make-dimension-field-non-final.patch b/patches/server/0220-Make-dimension-field-non-final.patch similarity index 93% rename from patches/server/0221-Make-dimension-field-non-final.patch rename to patches/server/0220-Make-dimension-field-non-final.patch index 49efa726a..f7f255aa0 100644 --- a/patches/server/0221-Make-dimension-field-non-final.patch +++ b/patches/server/0220-Make-dimension-field-non-final.patch @@ -1,4 +1,4 @@ -From 1e090794b1688f04ec20c47f4cd1a3f3d2092585 Mon Sep 17 00:00:00 2001 +From 44a057cb0da101db3d235347be97a63d0031fd09 Mon Sep 17 00:00:00 2001 From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com> Date: Sun, 31 Dec 2023 22:03:05 -0800 Subject: [PATCH] Make dimension field non-final @@ -18,5 +18,5 @@ index 9a2508c8..e536ae29 100644 // Add env and gen to constructor public WorldServer(MinecraftServer minecraftserver, IDataManager idatamanager, WorldData worlddata, int i, MethodProfiler methodprofiler, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) { -- -2.50.0 +2.51.0 diff --git a/patches/server/0222-Update-several-build-plugins.patch b/patches/server/0221-Update-several-build-plugins.patch similarity index 96% rename from patches/server/0222-Update-several-build-plugins.patch rename to patches/server/0221-Update-several-build-plugins.patch index 95d453513..48db88366 100644 --- a/patches/server/0222-Update-several-build-plugins.patch +++ b/patches/server/0221-Update-several-build-plugins.patch @@ -1,4 +1,4 @@ -From ea31acbbae4a5e75d6db743078d16ded234d14d1 Mon Sep 17 00:00:00 2001 +From a238088f4717bcd0191c42a6571e4419f09ef2c6 Mon Sep 17 00:00:00 2001 From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com> Date: Tue, 22 Aug 2023 10:11:12 -0700 Subject: [PATCH] Update several build plugins @@ -51,5 +51,5 @@ index f38265d6..c31fc87a 100644 ${basedir}/target/test-server -- -2.50.0 +2.51.0 diff --git a/patches/server/0223-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch b/patches/server/0222-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch similarity index 94% rename from patches/server/0223-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch rename to patches/server/0222-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch index 60f630c06..8c65e9ac5 100644 --- a/patches/server/0223-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch +++ b/patches/server/0222-Readd-NPE-prevention-for-BlockDispenseEntityEvent.patch @@ -1,4 +1,4 @@ -From e7fb21b1d7f2eb9e6903b08207fb5f8fc0b84273 Mon Sep 17 00:00:00 2001 +From b7147c1b12ec5a878fd72e7cae05edd6a2940b64 Mon Sep 17 00:00:00 2001 From: Christopher White <18whitechristop@gmail.com> Date: Sat, 20 Jul 2024 11:28:20 -0700 Subject: [PATCH] Readd NPE prevention for BlockDispenseEntityEvent @@ -22,5 +22,5 @@ index 9577483d..5c5ceed7 100644 BlockDispenseEntityEvent event = new BlockDispenseEntityEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d0, d1, d2), entity.getBukkitEntity()); if (!BlockDispenser.eventFired) { -- -2.50.0 +2.51.0 diff --git a/patches/server/0224-Fix-issues-with-non-interacting-players.patch b/patches/server/0223-Fix-issues-with-non-interacting-players.patch similarity index 95% rename from patches/server/0224-Fix-issues-with-non-interacting-players.patch rename to patches/server/0223-Fix-issues-with-non-interacting-players.patch index 8e214609f..212638733 100644 --- a/patches/server/0224-Fix-issues-with-non-interacting-players.patch +++ b/patches/server/0223-Fix-issues-with-non-interacting-players.patch @@ -1,4 +1,4 @@ -From 4220397023003a1781420e88ff18422c6d40935f Mon Sep 17 00:00:00 2001 +From f7980a6f0b2854a0a205ffb9d75d1f869487c758 Mon Sep 17 00:00:00 2001 From: Pugzy Date: Fri, 29 Sep 2023 17:35:55 +0100 Subject: [PATCH] Fix issues with non-interacting players @@ -30,5 +30,5 @@ index 3e5332f9..394b35b1 100644 if (axisalignedbb1 != null && axisalignedbb1.b(axisalignedbb)) { -- -2.50.0 +2.51.0 diff --git a/patches/server/0225-Fix-NPE-in-unloadAllChunks.patch b/patches/server/0224-Fix-NPE-in-unloadAllChunks.patch similarity index 91% rename from patches/server/0225-Fix-NPE-in-unloadAllChunks.patch rename to patches/server/0224-Fix-NPE-in-unloadAllChunks.patch index 03747a690..4f0d1a85f 100644 --- a/patches/server/0225-Fix-NPE-in-unloadAllChunks.patch +++ b/patches/server/0224-Fix-NPE-in-unloadAllChunks.patch @@ -1,4 +1,4 @@ -From dad1b8a89a409c0c2791ef0d5c48ff90ff2c7562 Mon Sep 17 00:00:00 2001 +From 6ee8af5812ee216e3d96341077d8efd8515a2150 Mon Sep 17 00:00:00 2001 From: Christopher White <18whitechristop@gmail.com> Date: Sun, 1 Oct 2023 13:24:05 -0700 Subject: [PATCH] Fix NPE in unloadAllChunks @@ -20,5 +20,5 @@ index 812686d5..8cdc6568 100644 public void unloadChunk(Chunk chunk) { -- -2.50.0 +2.51.0 diff --git a/patches/server/0226-Optimize-CraftPlayer.playEffect.patch b/patches/server/0225-Optimize-CraftPlayer.playEffect.patch similarity index 97% rename from patches/server/0226-Optimize-CraftPlayer.playEffect.patch rename to patches/server/0225-Optimize-CraftPlayer.playEffect.patch index 97e3b06ba..be4710543 100644 --- a/patches/server/0226-Optimize-CraftPlayer.playEffect.patch +++ b/patches/server/0225-Optimize-CraftPlayer.playEffect.patch @@ -1,4 +1,4 @@ -From 12e12863e96968b8b2ebccc6df43072232a89a19 Mon Sep 17 00:00:00 2001 +From 32727e0b02fdcb85f618756609cb2e1fceb0b3bb Mon Sep 17 00:00:00 2001 From: Christopher White <18whitechristop@gmail.com> Date: Fri, 8 Dec 2023 17:37:15 -0800 Subject: [PATCH] Optimize CraftPlayer.playEffect @@ -76,5 +76,5 @@ index ff4236cc..91007509 100644 } if ( extra == null ) -- -2.50.0 +2.51.0 diff --git a/patches/server/0227-Increase-chat-message-length-to-256.patch b/patches/server/0226-Increase-chat-message-length-to-256.patch similarity index 94% rename from patches/server/0227-Increase-chat-message-length-to-256.patch rename to patches/server/0226-Increase-chat-message-length-to-256.patch index 410a5d3ce..3883143d2 100644 --- a/patches/server/0227-Increase-chat-message-length-to-256.patch +++ b/patches/server/0226-Increase-chat-message-length-to-256.patch @@ -1,4 +1,4 @@ -From 0e7e8502f432eb838aa4cb3994fba19e97498dd4 Mon Sep 17 00:00:00 2001 +From ca12d6bdd3772d3ab15bc9803bad8ffc744a7d95 Mon Sep 17 00:00:00 2001 From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com> Date: Fri, 5 Jul 2024 21:12:10 -0700 Subject: [PATCH] Increase chat message length to 256 @@ -32,5 +32,5 @@ index 18358b43..d82dc0a8 100644 public void b(PacketDataSerializer packetdataserializer) throws IOException { -- -2.50.0 +2.51.0 diff --git a/patches/server/0228-Add-Tuinity-flush-patches.patch b/patches/server/0227-Add-Tuinity-flush-patches.patch similarity index 98% rename from patches/server/0228-Add-Tuinity-flush-patches.patch rename to patches/server/0227-Add-Tuinity-flush-patches.patch index 1e2c33a32..a732106b9 100644 --- a/patches/server/0228-Add-Tuinity-flush-patches.patch +++ b/patches/server/0227-Add-Tuinity-flush-patches.patch @@ -1,4 +1,4 @@ -From be0d6abfef5906949e07f2bedaf3ceacac8a6fca Mon Sep 17 00:00:00 2001 +From 84a796096f5bee51df3ce941d76c7915329dc31e Mon Sep 17 00:00:00 2001 From: Christopher White <18whitechristop@gmail.com> Date: Fri, 22 Sep 2023 15:58:16 -0700 Subject: [PATCH] Add Tuinity flush patches @@ -8,7 +8,7 @@ for network manager" and "Consolidate flush calls for entity tracker packets" patches diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 87bb6542..53bcd950 100644 +index 513e2c36..90fca5c6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -964,7 +964,26 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -176,5 +176,5 @@ index 9e35715a..1f14d087 100644 } finally { this.j.readLock().unlock(); -- -2.50.0 +2.51.0 diff --git a/patches/server/0229-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0228-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 94% rename from patches/server/0229-Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/server/0228-Use-TerminalConsoleAppender-for-console-improvements.patch index eb2024e20..69025f0cd 100644 --- a/patches/server/0229-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0228-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From 6a592314698c8dce978b3db2acf681b59d06a817 Mon Sep 17 00:00:00 2001 +From d68380dd347afb1b45d1d4c9e5e224293ea999ed Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -240,7 +240,7 @@ index 79a53cc4..194609e7 100644 System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 53bcd950..3aaa9be6 100644 +index 90fca5c6..f6a9add2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -47,7 +47,7 @@ import org.apache.logging.log4j.Logger; @@ -289,13 +289,41 @@ index 53bcd950..3aaa9be6 100644 } catch (Exception ignored) { } // CraftBukkit end -@@ -1294,7 +1298,8 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -1294,7 +1298,36 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs } public void sendMessage(IChatBaseComponent ichatbasecomponent) { -- this.console.sendMessage(ichatbasecomponent.c()); // CraftBukkit - we want coloured and pretty messages too! -+ // SportPaper - Log message with colors -+ MinecraftServer.LOGGER.info(org.bukkit.craftbukkit.util.CraftChatMessage.fromComponent(ichatbasecomponent, EnumChatFormat.RESET)); +- MinecraftServer.LOGGER.info(ichatbasecomponent.c()); ++ // SportPaper - Log messages with colors ++ MinecraftServer.LOGGER.info(fromComponent(ichatbasecomponent)); ++ } ++ ++ private static String fromComponent(IChatBaseComponent component) { ++ // SportPaper - copy of fromComponent in CraftChatMessage that does not limit iterations ++ if (component == null) return ""; ++ StringBuilder out = new StringBuilder(); ++ ++ for (IChatBaseComponent c : component) { ++ ChatModifier modi = c.getChatModifier(); ++ out.append(modi.getColor() == null ? EnumChatFormat.RESET : modi.getColor()); ++ if (modi.isBold()) { ++ out.append(EnumChatFormat.BOLD); ++ } ++ if (modi.isItalic()) { ++ out.append(EnumChatFormat.ITALIC); ++ } ++ if (modi.isUnderlined()) { ++ out.append(EnumChatFormat.UNDERLINE); ++ } ++ if (modi.isStrikethrough()) { ++ out.append(EnumChatFormat.STRIKETHROUGH); ++ } ++ if (modi.isRandom()) { ++ out.append(EnumChatFormat.OBFUSCATED); ++ } ++ out.append(c.getText()); ++ } ++ return out.toString().replaceFirst("^(" + EnumChatFormat.RESET + ")*", ""); } public boolean a(int i, String s) { @@ -556,5 +584,5 @@ index 63cb069f..a3fcd871 100644 -- -2.50.0 +2.51.0 diff --git a/patches/server/0230-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/patches/server/0229-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch similarity index 97% rename from patches/server/0230-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch rename to patches/server/0229-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index 85f89bc48..9660ce4c8 100644 --- a/patches/server/0230-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/patches/server/0229-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -1,4 +1,4 @@ -From 3f289a88c1f05aeab139a92ef1b182ee31aa05ea Mon Sep 17 00:00:00 2001 +From 8440a8844d9f46b008aed20befa671ae10e9738f Mon Sep 17 00:00:00 2001 From: Minecrell Date: Mon, 18 Sep 2017 12:00:03 +0200 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger @@ -74,5 +74,5 @@ index 93526ab6..7dd83f9b 100644 + */ } -- -2.50.0 +2.51.0 diff --git a/patches/server/0231-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0230-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 95% rename from patches/server/0231-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/server/0230-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index 5fbfda284..9f80b5ee9 100644 --- a/patches/server/0231-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/0230-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -1,4 +1,4 @@ -From 6c14dadfed2162e493010629fa6c58cfe6920147 Mon Sep 17 00:00:00 2001 +From 16ab64a36c84f55a1355d071d042621d5f9fa4ea Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Thu, 12 Aug 2021 04:46:41 -0700 Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread @@ -47,5 +47,5 @@ index a3fcd871..128f6ece 100644 -- -2.50.0 +2.51.0