Paper/Spigot-Server-Patches/0063-Disable-Scoreboards-for-non-players-by-default.patch

54 lines
2.5 KiB
Diff
Raw Normal View History

2017-06-08 22:16:51 +08:00
From d6447f966a098b3fc6e8d537225d43e98069cd34 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 8 Mar 2016 23:25:45 -0500
Subject: [PATCH] Disable Scoreboards for non players by default
Entities collision is checking for scoreboards setting.
This is very heavy to do map lookups for every collision to check
this setting.
So avoid looking up scoreboards and short circuit to the "not on a team"
logic which is most likely to be true.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index fa49397ea..9987a5c7a 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -244,4 +244,9 @@ public class PaperWorldConfig {
private void disableTeleportationSuffocationCheck() {
disableTeleportationSuffocationCheck = getBoolean("disable-teleportation-suffocation-check", false);
}
+
+ public boolean nonPlayerEntitiesOnScoreboards = false;
+ private void nonPlayerEntitiesOnScoreboards() {
+ nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
+ }
}
diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
2017-06-08 22:16:51 +08:00
index ec9a87239..b08274d93 100644
--- a/src/main/java/net/minecraft/server/CommandScoreboard.java
+++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
2016-11-17 10:23:38 +08:00
@@ -492,6 +492,7 @@ public class CommandScoreboard extends CommandAbstract {
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
+ if (!entity.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(entity instanceof EntityHuman)) { continue; } // Paper
2017-06-08 22:16:51 +08:00
String s2 = f(minecraftserver, icommandlistener, entity.bn());
if (scoreboard.addPlayerToTeam(s2, s)) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
2017-06-08 22:16:51 +08:00
index b4f42a71d..e78b3789f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2017-05-15 02:05:01 +08:00
@@ -2074,6 +2074,7 @@ public abstract class Entity implements ICommandListener {
2016-05-12 10:07:46 +08:00
@Nullable
2017-06-08 22:16:51 +08:00
public ScoreboardTeamBase aY() {
+ if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
2017-06-08 22:16:51 +08:00
return this.world.getScoreboard().getPlayerTeam(this.bn());
}
--
2017-06-08 22:16:51 +08:00
2.13.1