51 Zeilen
2.8 KiB
Diff
51 Zeilen
2.8 KiB
Diff
|
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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index abbbe1786eb68af02f9d39650aad730ac44aac8a..3ac2ac3db9b1c271b3c21930bb13716669ff64d3 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -210,4 +210,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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
index a6f2e671cc9b2ef086dfa3d127a7b33272acbd56..93d3408231a177cf6d2086594756adffe3efa702 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -2288,6 +2288,7 @@ public abstract class Entity implements Nameable, CommandSource, net.minecraft.s
|
||
|
|
|
||
|
|
@Nullable
|
||
|
|
public Team getTeam() {
|
||
|
|
+ if (!this.level.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof Player)) { return null; } // Paper
|
||
|
|
return this.level.getScoreboard().getPlayerTeam(this.getScoreboardName());
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
index afd114e1ce00db72534d470fed12101bb237f266..d483d552092c901fec262c43e488784d9cd8acb9 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
@@ -738,6 +738,7 @@ public abstract class LivingEntity extends Entity {
|
||
|
|
if (tag.contains("Team", 8)) {
|
||
|
|
String s = tag.getString("Team");
|
||
|
|
PlayerTeam scoreboardteam = this.level.getScoreboard().getTeam(s);
|
||
|
|
+ if (!level.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof net.minecraft.world.entity.player.Player)) { scoreboardteam = null; } // Paper
|
||
|
|
boolean flag = scoreboardteam != null && this.level.getScoreboard().addPlayerToTeam(this.getStringUUID(), scoreboardteam);
|
||
|
|
|
||
|
|
if (!flag) {
|