54 lines
2.6 KiB
Diff
54 lines
2.6 KiB
Diff
|
From d449dd493b3e46612bf2b0abdc33424e91458515 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 f3b4288..c47de89 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -269,4 +269,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
|
||
|
|
index 871535c..25950bd 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/CommandScoreboard.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
|
||
|
|
@@ -490,6 +490,7 @@ public class CommandScoreboard extends CommandAbstract {
|
||
|
|
|
||
|
|
while (iterator.hasNext()) {
|
||
|
|
Entity entity = (Entity) iterator.next();
|
||
|
|
+ if (!entity.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(entity instanceof EntityHuman)) { continue; } // Paper
|
||
|
|
String s2 = e(minecraftserver, icommandlistener, entity.getUniqueID().toString());
|
||
|
|
|
||
|
|
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
|
||
|
|
index 100a5e0..8221b84 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
@@ -1844,6 +1844,7 @@ public abstract class Entity implements ICommandListener {
|
||
|
|
}
|
||
|
|
|
||
|
|
public ScoreboardTeamBase aO() {
|
||
|
|
+ if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
|
||
|
|
return this.world.getScoreboard().getPlayerTeam(this.getUniqueID().toString());
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.7.2
|
||
|
|
|