2018-08-27 02:11:49 +08:00
|
|
|
From 318ea0ac3b760220892f620d0218a490fcd390b5 Mon Sep 17 00:00:00 2001
|
2016-03-09 12:42:08 +08:00
|
|
|
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
|
2018-08-05 05:03:53 +08:00
|
|
|
index 4a2d296746..2b25da0465 100644
|
2016-03-09 12:42:08 +08:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-07-24 08:24:44 +08:00
|
|
|
@@ -193,4 +193,9 @@ public class PaperWorldConfig {
|
2016-03-09 12:42:08 +08:00
|
|
|
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/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
2018-08-27 02:11:49 +08:00
|
|
|
index f6cdff0ef9..9e1c427fcc 100644
|
2016-03-09 12:42:08 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2018-08-27 02:11:49 +08:00
|
|
|
@@ -2243,6 +2243,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2016-03-09 12:42:08 +08:00
|
|
|
|
2016-05-12 10:07:46 +08:00
|
|
|
@Nullable
|
2018-07-15 09:53:17 +08:00
|
|
|
public ScoreboardTeamBase be() {
|
2016-03-09 12:42:08 +08:00
|
|
|
+ if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
|
2018-07-15 09:53:17 +08:00
|
|
|
return this.world.getScoreboard().getPlayerTeam(this.getName());
|
2016-03-09 12:42:08 +08:00
|
|
|
}
|
|
|
|
|
2018-07-15 09:53:17 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
2018-08-27 02:11:49 +08:00
|
|
|
index dd216c64e9..ed6f5e70f3 100644
|
2018-07-15 09:53:17 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
2018-08-05 05:03:53 +08:00
|
|
|
@@ -538,6 +538,7 @@ public abstract class EntityLiving extends Entity {
|
2018-07-15 09:53:17 +08:00
|
|
|
if (nbttagcompound.hasKeyOfType("Team", 8)) {
|
|
|
|
String s = nbttagcompound.getString("Team");
|
|
|
|
ScoreboardTeam scoreboardteam = this.world.getScoreboard().getTeam(s);
|
|
|
|
+ if (!world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { scoreboardteam = null; } // Paper
|
|
|
|
boolean flag = scoreboardteam != null && this.world.getScoreboard().addPlayerToTeam(this.bu(), scoreboardteam);
|
|
|
|
|
|
|
|
if (!flag) {
|
2016-03-09 12:42:08 +08:00
|
|
|
--
|
2018-08-05 05:03:53 +08:00
|
|
|
2.18.0
|
2016-03-09 12:42:08 +08:00
|
|
|
|