core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0133-String-based-Action-Ba...

67 lines
2.7 KiB
Diff
Raw Normal View History

Rebuild all patches using the new rebuild pattern
2020-05-06 09:48:49 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
Change implementation of String based Action Bar API Appears colors did not work for Bungee version, as Action Bar is stricter
2016-12-27 20:06:14 +00:00
From: Aikar <aikar@aikar.co>
Date: Tue, 27 Dec 2016 15:02:42 -0500
Subject: [PATCH] String based Action Bar API
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
Implement Chunk Priority / Urgency System for Chunks Mark chunks that are blocking main thread for world generation as urgent Implements a general priority system so that chunks that are sorted in the generator queues can prioritize certain chunks over another. Urgent chunks will jump to the front of the line, ensuring that a sync chunk load on an ungenerated chunk does not lag the server for a long period of time if the servers generator queues are filled with lots of chunks already. This massively reduces the lag spikes from sync chunk gens. Then we further prioritize loading order so nearby chunks have higher priority than distant chunks, reducing the pressure a high no tick view distance holds on you. Chunks in front of the player have higher priority, to help with fast traveling players keep up with their movement. This commit also improves single core cpu scenarios in that we will now automatically disable Async Chunks as well as Minecrafts thread pool. It is never recommended to use async chunks on a single CPU as context switching will be slower than just running it all on main. This also bumps the number of server worker threads by default too. Mojang does not utilize the workers in an effecient manner, resulting in them using barely any sustained CPU. So give it more workers so more chunks can be processed concurrently This change also improves urgent chunk loading, so players flying into unloaded chunks will hurt a little bit less (but still hurt) Ping #3395 #3363 (Not marking as closed, we need to make prevent moving work)
2020-05-19 08:01:53 +00:00
index b40cd1fad5c9e2f0f85c87a559caf2b780814017..f9a7a1e9eea67bafb85c0ed88e96abb8e45f6c81 100644
Change implementation of String based Action Bar API Appears colors did not work for Bungee version, as Action Bar is stricter
2016-12-27 20:06:14 +00:00
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-03 23:59:54 +00:00
@@ -2,6 +2,7 @@ package net.minecraft.server;
Change implementation of String based Action Bar API Appears colors did not work for Bungee version, as Action Bar is stricter
2016-12-27 20:06:14 +00:00
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-03 23:59:54 +00:00
import com.destroystokyo.paper.block.TargetBlockInfo;
Change implementation of String based Action Bar API Appears colors did not work for Bungee version, as Action Bar is stricter
2016-12-27 20:06:14 +00:00
import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.commons.lang.exception.ExceptionUtils;
import org.bukkit.Location;
Add ray tracing methods to LivingEntity (#1410) This method will return the Block a player is looking at while taking into consideration the AABB of each block in the path. For example, you can look through the 1/4 space of air in a Stair block and get the block behind it instead of the Stair block you are looking past.
2018-09-03 23:59:54 +00:00
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftWorld;
Implement Chunk Priority / Urgency System for Chunks Mark chunks that are blocking main thread for world generation as urgent Implements a general priority system so that chunks that are sorted in the generator queues can prioritize certain chunks over another. Urgent chunks will jump to the front of the line, ensuring that a sync chunk load on an ungenerated chunk does not lag the server for a long period of time if the servers generator queues are filled with lots of chunks already. This massively reduces the lag spikes from sync chunk gens. Then we further prioritize loading order so nearby chunks have higher priority than distant chunks, reducing the pressure a high no tick view distance holds on you. Chunks in front of the player have higher priority, to help with fast traveling players keep up with their movement. This commit also improves single core cpu scenarios in that we will now automatically disable Async Chunks as well as Minecrafts thread pool. It is never recommended to use async chunks on a single CPU as context switching will be slower than just running it all on main. This also bumps the number of server worker threads by default too. Mojang does not utilize the workers in an effecient manner, resulting in them using barely any sustained CPU. So give it more workers so more chunks can be processed concurrently This change also improves urgent chunk loading, so players flying into unloaded chunks will hurt a little bit less (but still hurt) Ping #3395 #3363 (Not marking as closed, we need to make prevent moving work)
2020-05-19 08:01:53 +00:00
@@ -195,6 +196,24 @@ public final class MCUtil {
Change implementation of String based Action Bar API Appears colors did not work for Bungee version, as Action Bar is stricter
2016-12-27 20:06:14 +00:00
private MCUtil() {}
+ /**
+ * Quickly generate a stack trace for current location
+ *
+ * @return Stacktrace
+ */
+ public static String stack() {
+ return ExceptionUtils.getFullStackTrace(new Throwable());
+ }
+
+ /**
+ * Quickly generate a stack trace for current location with message
+ *
+ * @param str
+ * @return Stacktrace
+ */
+ public static String stack(String str) {
+ return ExceptionUtils.getFullStackTrace(new Throwable(str));
+ }
Add mc util methods
2018-07-22 04:45:49 +00:00
public static boolean isMainThread() {
return MinecraftServer.getServer().isMainThread();
Change implementation of String based Action Bar API Appears colors did not work for Bungee version, as Action Bar is stricter
2016-12-27 20:06:14 +00:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
Rebuild all patches using the new rebuild pattern
2020-05-06 09:48:49 +00:00
index 764a8ef952b6f3a38ae8430c0648ad1694aa89b9..d349f0c87bfad19cf0bddb4709f1d7b0dd4b4a36 100644
Change implementation of String based Action Bar API Appears colors did not work for Bungee version, as Action Bar is stricter
2016-12-27 20:06:14 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
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: 7361a62e SPIGOT-5641: Add Block.getDrops(ItemStack, Entity) 1dc91b15 Add specific notes about what is not API 2b05ef88 #484: Allow statistics to be accessed for offline players CraftBukkit Changes: f7d6ad53 SPIGOT-5603: Use LootContext#lootingModifier in CraftLootTable 5838285d SPIGOT-5657: BlockPlaceEvent not cancelling for tripwire hooks f325b9be SPIGOT-5641: Add Block.getDrops(ItemStack, Entity) e25a2272 Fix some formatting in CraftHumanEntity 498540e0 Add Merchant slot delegate b2de47d5 SPIGOT-5621: Add missing container types for opening InventoryView aa3a2f27 #645: Allow statistics to be accessed for offline players 2122c0b1 #649: CraftBell should implement Bell
2020-04-08 07:49:15 +00:00
@@ -216,6 +216,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
Fix NPE when getting location from players EnderChest (fixes #1041)
2018-03-10 13:07:40 +00:00
}
Change implementation of String based Action Bar API Appears colors did not work for Bungee version, as Action Bar is stricter
2016-12-27 20:06:14 +00:00
// Paper start
Fix NPE when getting location from players EnderChest (fixes #1041)
2018-03-10 13:07:40 +00:00
+ @Override
Change implementation of String based Action Bar API Appears colors did not work for Bungee version, as Action Bar is stricter
2016-12-27 20:06:14 +00:00
+ public void sendActionBar(String message) {
+ if (getHandle().playerConnection == null || message == null || message.isEmpty()) return;
NOT FINISHED! She compiles, and she... suffers the wrath of chunkgen...
2018-07-19 04:42:43 +00:00
+ getHandle().playerConnection.sendPacket(new PacketPlayOutChat(new net.minecraft.server.ChatComponentText(message), net.minecraft.server.ChatMessageType.GAME_INFO));
Change implementation of String based Action Bar API Appears colors did not work for Bungee version, as Action Bar is stricter
2016-12-27 20:06:14 +00:00
+ }
+
+ @Override
+ public void sendActionBar(char alternateChar, String message) {
+ if (message == null || message.isEmpty()) return;
+ sendActionBar(org.bukkit.ChatColor.translateAlternateColorCodes(alternateChar, message));
+ }
+
Fix NPE when getting location from players EnderChest (fixes #1041)
2018-03-10 13:07:40 +00:00
@Override
Change implementation of String based Action Bar API Appears colors did not work for Bungee version, as Action Bar is stricter
2016-12-27 20:06:14 +00:00
public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
fix paper tab list API
2018-09-01 10:09:13 +00:00
if (header != null) {