core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0171-Fix-this-stupid-bullsh...

34 lines
1.7 KiB
Diff
Raw Normal View History

Update upstream & fix some chunk related issues (#2177) * Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
2019-06-14 02:27:40 +00:00
From e7da035fc66ac524b9c12166e031d9bb6d175ae5 Mon Sep 17 00:00:00 2001
Fix this stupid bullshit
2017-08-06 22:18:20 +00:00
From: DemonWav <demonwav@gmail.com>
Date: Sun, 6 Aug 2017 17:17:53 -0500
Subject: [PATCH] Fix this stupid bullshit
Update CB, refactor 0229-Fix-this-stupid-bullshit Refactored 0229-Fix-this-stupid-bullshit in order to prevent merge conflicts when spigot decides to update the timer and to provide some form of hint in the console/log on startup.
2017-09-15 14:37:05 +00:00
Disable the 15 second sleep when the server jar hasn't been rebuilt within a period of time.
modified in order to prevent merge conflicts when Spigot changes/disables the warning,
and to provide some level of hint without being disruptive.
Fix this stupid bullshit
2017-08-06 22:18:20 +00:00
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
2019-06-06 15:36:57 +00:00
index 4aebe53f8a..405ea5c465 100644
Fix this stupid bullshit
2017-08-06 22:18:20 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
Update Upstream
2019-05-06 02:58:04 +00:00
@@ -217,10 +217,12 @@ public class Main {
Update CB, refactor 0229-Fix-this-stupid-bullshit Refactored 0229-Fix-this-stupid-bullshit in order to prevent merge conflicts when spigot decides to update the timer and to provide some form of hint in the console/log on startup.
2017-09-15 14:37:05 +00:00
Calendar deadline = Calendar.getInstance();
More patches for 1.14 Chunk related stuff will need to be revisted later
2019-04-27 23:23:53 +00:00
deadline.add(Calendar.DAY_OF_YEAR, -3);
Update CB, refactor 0229-Fix-this-stupid-bullshit Refactored 0229-Fix-this-stupid-bullshit in order to prevent merge conflicts when spigot decides to update the timer and to provide some form of hint in the console/log on startup.
2017-09-15 14:37:05 +00:00
if (buildDate.before(deadline.getTime())) {
- System.err.println("*** Error, this build is outdated ***");
+ // Paper start - This is some stupid bullshit
+ System.err.println("*** Warning, you've not updated in a while! ***");
Upstate upstream B/CB --- work/Bukkit Submodule work/Bukkit 9a793cce8..0c1d258bb: > Make PigZapEvent extend EntityTransformEvent --- work/CraftBukkit Submodule work/CraftBukkit ee6684bba..6a398ac44: > SPIGOT-4511: Trident doesn't lose durability > Tweak outdated windows
2018-12-02 23:31:09 +00:00
System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads ***"); // Paper
Update upstream B/CB
2018-08-02 23:29:34 +00:00
- System.err.println("*** Server will start in 20 seconds ***");
- Thread.sleep(TimeUnit.SECONDS.toMillis(20));
+ //System.err.println("*** Server will start in 20 seconds ***");
+ //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
Update CB, refactor 0229-Fix-this-stupid-bullshit Refactored 0229-Fix-this-stupid-bullshit in order to prevent merge conflicts when spigot decides to update the timer and to provide some form of hint in the console/log on startup.
2017-09-15 14:37:05 +00:00
+ // Paper End
Fix this stupid bullshit
2017-08-06 22:18:20 +00:00
}
}
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes: d3ed1516 Fix dangerously threaded beacons 217a293d Don't relocate joptsimple to allow --help to work. 1be05a21 Prepare for imminent Java 12 release a49270b2 Mappings Update 5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
2019-03-20 01:46:00 +00:00
2.21.0
Fix this stupid bullshit
2017-08-06 22:18:20 +00:00