2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 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/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2022-03-30 22:28:38 +02:00
|
|
|
@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Nullable
|
|
|
|
public Team getTeam() {
|
2023-06-07 20:31:32 +02:00
|
|
|
+ if (!this.level().paperConfig().scoreboards.allowNonPlayerEntitiesOnScoreboards && !(this instanceof Player)) { return null; } // Paper
|
|
|
|
return this.level().getScoreboard().getPlayersTeam(this.getScoreboardName());
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2023-03-14 19:36:39 +01:00
|
|
|
@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2021-06-12 02:57:04 +02:00
|
|
|
if (nbt.contains("Team", 8)) {
|
|
|
|
String s = nbt.getString("Team");
|
2023-06-07 20:31:32 +02:00
|
|
|
PlayerTeam scoreboardteam = this.level().getScoreboard().getPlayerTeam(s);
|
|
|
|
+ if (!this.level().paperConfig().scoreboards.allowNonPlayerEntitiesOnScoreboards && !(this instanceof net.minecraft.world.entity.player.Player)) { scoreboardteam = null; } // Paper
|
|
|
|
boolean flag = scoreboardteam != null && this.level().getScoreboard().addPlayerToTeam(this.getStringUUID(), scoreboardteam);
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
if (!flag) {
|