Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-03 09:19:38 +01:00
Code Issues Projects Releases Wiki Activity
15f3ca7ecb
Paper/Spigot-Server-Patches/0071-Disable-Scoreboards-for-non-players-by-default.patch

54 lines
2.5 KiB
Diff
Raw Normal View History

Optimize isInvalidYLocation, getType and getBlockData Some pretty micro optimizations, but this is the hottest method in the server.... This will drastically reduce number of operations to perform getType the 2 previous patches was squashed into 1
2016-06-23 04:43:02 +02:00
From 777ae8cd4930e25569e4bcb8b2a328ab69dbd327 Mon Sep 17 00:00:00 2001
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.
2016-03-09 05:42:08 +01: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
bump the default maxMobSpawns default to 250, and add support for unlimited Use -1 to represent vanilla/unlimited. Updated PaperWorldConfig to also update the individual worlds limit if it was set to the new default value. Should hopefully help #235
2016-05-17 04:07:12 +02:00
index 034369a..308dfdd 100644
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.
2016-03-09 05:42:08 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
bump the default maxMobSpawns default to 250, and add support for unlimited Use -1 to represent vanilla/unlimited. Updated PaperWorldConfig to also update the individual worlds limit if it was set to the new default value. Should hopefully help #235
2016-05-17 04:07:12 +02:00
@@ -264,4 +264,9 @@ public class PaperWorldConfig {
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.
2016-03-09 05:42:08 +01: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/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
Update to Minecraft 1.10
2016-06-09 05:57:14 +02:00
index 5f579bc..8e5419d 100644
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.
2016-03-09 05:42:08 +01:00
--- a/src/main/java/net/minecraft/server/CommandScoreboard.java
+++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
Paper 1.9.4 Update
2016-05-12 04:07:46 +02:00
@@ -491,6 +491,7 @@ public class CommandScoreboard extends CommandAbstract {
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.
2016-03-09 05:42:08 +01:00
while (iterator.hasNext()) {
Entity entity = (Entity) iterator.next();
+ if (!entity.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(entity instanceof EntityHuman)) { continue; } // Paper
Update to Minecraft 1.10
2016-06-09 05:57:14 +02:00
String s2 = e(minecraftserver, icommandlistener, entity.bf());
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.
2016-03-09 05:42:08 +01:00
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
Fix missed case in top of nether void damage patch General cleanup, etc. Closes GH-343
2016-06-18 07:25:37 +02:00
index 1764791..153fc76 100644
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.
2016-03-09 05:42:08 +01:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Fix missed case in top of nether void damage patch General cleanup, etc. Closes GH-343
2016-06-18 07:25:37 +02:00
@@ -1894,6 +1894,7 @@ public abstract class Entity implements ICommandListener {
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.
2016-03-09 05:42:08 +01:00
Paper 1.9.4 Update
2016-05-12 04:07:46 +02:00
@Nullable
Update to Minecraft 1.10
2016-06-09 05:57:14 +02:00
public ScoreboardTeamBase aQ() {
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.
2016-03-09 05:42:08 +01:00
+ if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
Update to Minecraft 1.10
2016-06-09 05:57:14 +02:00
return this.world.getScoreboard().getPlayerTeam(this.bf());
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.
2016-03-09 05:42:08 +01:00
}
--
Update upstream
2016-06-23 04:18:41 +02:00
2.9.0
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.
2016-03-09 05:42:08 +01:00
Reference in New Issue Copy Permalink