2020-05-06 11:48:49 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2018-07-15 03:53:17 +02:00
From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 02:10:49 -0400
Subject: [PATCH] Configurable Player Collision
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
2021-01-02 05:59:30 +01:00
index 772f48ca940b235481dd27669d9370e53f5380dd..042cb74c9c55366d91e98449bd51ad2b1d071324 100644
2018-07-15 03:53:17 +02:00
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
2021-01-02 05:59:30 +01:00
@@ -227,4 +227,9 @@ public class PaperConfig {
2018-07-15 03:53:17 +02:00
private static void regionFileCacheSize() {
2019-06-17 05:52:34 +02:00
regionFileCacheSize = Math.max(getInt("settings.region-file-cache-size", 256), 4);
2018-07-15 03:53:17 +02:00
}
+
+ public static boolean enablePlayerCollisions = true;
+ private static void enablePlayerCollisions() {
+ enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
2021-02-16 18:08:29 +01:00
index a3913ee0756f79159ea0671c9041ab68db0aa121..31cc60dcf998cf07ca8db14dba37145ed5b3601c 100644
2018-07-15 03:53:17 +02:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2020-08-25 04:22:08 +02:00
@@ -432,6 +432,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2019-05-06 04:58:04 +02:00
this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
2019-04-27 05:05:36 +02:00
}
2018-07-15 03:53:17 +02:00
+ // Paper start - Handle collideRule team for player collision toggle
+ final Scoreboard scoreboard = this.getScoreboard();
+ final java.util.Collection<String> toRemove = scoreboard.getTeams().stream().filter(team -> team.getName().startsWith("collideRule_")).map(ScoreboardTeam::getName).collect(java.util.stream.Collectors.toList());
+ for (String teamName : toRemove) {
+ scoreboard.removeTeam(scoreboard.getTeam(teamName)); // Clean up after ourselves
+ }
+
+ if (!com.destroystokyo.paper.PaperConfig.enablePlayerCollisions) {
2018-08-26 20:11:49 +02:00
+ this.getPlayerList().collideRuleTeamName = org.apache.commons.lang3.StringUtils.left("collideRule_" + java.util.concurrent.ThreadLocalRandom.current().nextInt(), 16);
2018-07-15 03:53:17 +02:00
+ ScoreboardTeam collideTeam = scoreboard.createTeam(this.getPlayerList().collideRuleTeamName);
+ collideTeam.setCanSeeFriendlyInvisibles(false); // Because we want to mimic them not being on a team at all
+ }
+ // Paper end
2019-04-27 05:05:36 +02:00
+
this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
2019-08-05 18:35:40 +02:00
this.serverConnection.acceptConnections();
2018-07-15 03:53:17 +02:00
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
2020-06-25 13:00:35 +02:00
index d1581c9d9838797eb425020d21bd0fba432e5652..99dc43159f240135957aee35f6129f19419c6c25 100644
2018-07-15 03:53:17 +02:00
--- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
+++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
2020-06-25 13:00:35 +02:00
@@ -105,7 +105,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
2018-07-15 03:53:17 +02:00
packetdataserializer.a(this.b);
packetdataserializer.writeByte(this.j);
packetdataserializer.a(this.e);
- packetdataserializer.a(this.f);
+ packetdataserializer.a(!com.destroystokyo.paper.PaperConfig.enablePlayerCollisions ? "never" : this.f); // Paper
2019-01-01 04:15:55 +01:00
packetdataserializer.a((Enum) this.g);
2018-07-15 03:53:17 +02:00
packetdataserializer.a(this.c);
packetdataserializer.a(this.d);
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
2021-02-21 20:45:33 +01:00
index 430d86aba42de6de057a78d78e9d8c41bc6fd680..a1ec2ae7c3152019b3d01166547e6931d4bf2b57 100644
2018-07-15 03:53:17 +02:00
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2021-02-21 20:45:33 +01:00
@@ -77,6 +77,7 @@ public abstract class PlayerList {
2018-07-15 03:53:17 +02:00
// CraftBukkit start
private CraftServer cserver;
2019-01-01 04:15:55 +01:00
private final Map<String,EntityPlayer> playersByName = new java.util.HashMap<>();
2018-07-15 03:53:17 +02:00
+ @Nullable String collideRuleTeamName; // Paper - Team name used for collideRule
2020-06-25 13:00:35 +02:00
public PlayerList(MinecraftServer minecraftserver, IRegistryCustom.Dimension iregistrycustom_dimension, WorldNBTStorage worldnbtstorage, int i) {
2019-04-27 05:05:36 +02:00
this.cserver = minecraftserver.server = new CraftServer((DedicatedServer) minecraftserver, this);
2020-06-27 07:12:11 +02:00
@@ -305,6 +306,13 @@ public abstract class PlayerList {
2018-07-15 03:53:17 +02:00
}
entityplayer.syncInventory();
+ // Paper start - Add to collideRule team if needed
2020-06-26 14:04:38 +02:00
+ final Scoreboard scoreboard = this.getServer().getWorldServer(World.OVERWORLD).getScoreboard();
2018-07-19 06:42:43 +02:00
+ final ScoreboardTeam collideRuleTeam = scoreboard.getTeam(collideRuleTeamName);
2018-12-17 06:18:06 +01:00
+ if (this.collideRuleTeamName != null && collideRuleTeam != null && entityplayer.getScoreboardTeam() == null) {
2018-07-19 06:42:43 +02:00
+ scoreboard.addPlayerToTeam(entityplayer.getName(), collideRuleTeam);
2018-07-15 03:53:17 +02:00
+ }
+ // Paper end
// CraftBukkit - Moved from above, added world
2020-06-25 13:00:35 +02:00
PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), worldserver1.worldDataServer.getName(), entityplayer.locX(), entityplayer.locY(), entityplayer.locZ());
2018-07-15 03:53:17 +02:00
}
2020-10-01 15:16:32 +02:00
@@ -425,6 +433,16 @@ public abstract class PlayerList {
2020-06-24 02:25:28 +02:00
entityplayer.playerTick(); // SPIGOT-924
2018-07-15 03:53:17 +02:00
// CraftBukkit end
+ // Paper start - Remove from collideRule team if needed
+ if (this.collideRuleTeamName != null) {
2020-06-26 14:04:38 +02:00
+ final Scoreboard scoreBoard = this.server.getWorldServer(World.OVERWORLD).getScoreboard();
2018-07-15 03:53:17 +02:00
+ final ScoreboardTeam team = scoreBoard.getTeam(this.collideRuleTeamName);
2018-12-17 06:18:06 +01:00
+ if (entityplayer.getScoreboardTeam() == team && team != null) {
2018-07-15 03:53:17 +02:00
+ scoreBoard.removePlayerFromTeam(entityplayer.getName(), team);
+ }
+ }
+ // Paper end
+
this.savePlayerFile(entityplayer);
if (entityplayer.isPassenger()) {
Entity entity = entityplayer.getRootVehicle();
2020-10-01 15:16:32 +02:00
@@ -1073,6 +1091,13 @@ public abstract class PlayerList {
2018-07-15 03:53:17 +02:00
}
// CraftBukkit end
2019-12-11 03:43:21 +01:00
2018-07-15 03:53:17 +02:00
+ // Paper start - Remove collideRule team if it exists
+ if (this.collideRuleTeamName != null) {
2020-06-26 14:04:38 +02:00
+ final Scoreboard scoreboard = this.getServer().getWorldServer(World.OVERWORLD).getScoreboard();
2018-07-15 03:53:17 +02:00
+ final ScoreboardTeam team = scoreboard.getTeam(this.collideRuleTeamName);
+ if (team != null) scoreboard.removeTeam(team);
+ }
+ // Paper end
}
// CraftBukkit start