aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0088-Configurable-Player-Collision.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0088-Configurable-Player-Collision.patch')
-rw-r--r--patches/server/0088-Configurable-Player-Collision.patch101
1 files changed, 101 insertions, 0 deletions
diff --git a/patches/server/0088-Configurable-Player-Collision.patch b/patches/server/0088-Configurable-Player-Collision.patch
new file mode 100644
index 0000000000..719e6bb654
--- /dev/null
+++ b/patches/server/0088-Configurable-Player-Collision.patch
@@ -0,0 +1,101 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Wed, 13 Apr 2016 02:10:49 -0400
+Subject: [PATCH] Configurable Player Collision
+
+
+diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
+index 9a1a961eabd4362c171da78c6be82c867f3696a4..1d0c473442b5c72245c356054440323e3c5d4711 100644
+--- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
++++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
+@@ -200,7 +200,7 @@ public class ClientboundSetPlayerTeamPacket implements Packet<ClientGamePacketLi
+ ComponentSerialization.TRUSTED_STREAM_CODEC.encode(buf, this.displayName);
+ buf.writeByte(this.options);
+ buf.writeUtf(this.nametagVisibility);
+- buf.writeUtf(this.collisionRule);
++ buf.writeUtf(!io.papermc.paper.configuration.GlobalConfiguration.get().collisions.enablePlayerCollisions ? "never" : this.collisionRule); // Paper - Configurable player collision
+ buf.writeEnum(this.color);
+ ComponentSerialization.TRUSTED_STREAM_CODEC.encode(buf, this.playerPrefix);
+ ComponentSerialization.TRUSTED_STREAM_CODEC.encode(buf, this.playerSuffix);
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index a37f11633663e07652274707b29a849e518511c5..6dec7884fdd15eb8f32e8831ed0f3a92af710472 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -640,6 +640,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
+ }
+
++ // Paper start - Configurable player collision; Handle collideRule team for player collision toggle
++ final ServerScoreboard scoreboard = this.getScoreboard();
++ final java.util.Collection<String> toRemove = scoreboard.getPlayerTeams().stream().filter(team -> team.getName().startsWith("collideRule_")).map(net.minecraft.world.scores.PlayerTeam::getName).collect(java.util.stream.Collectors.toList());
++ for (String teamName : toRemove) {
++ scoreboard.removePlayerTeam(scoreboard.getPlayerTeam(teamName)); // Clean up after ourselves
++ }
++
++ if (!io.papermc.paper.configuration.GlobalConfiguration.get().collisions.enablePlayerCollisions) {
++ this.getPlayerList().collideRuleTeamName = org.apache.commons.lang3.StringUtils.left("collideRule_" + java.util.concurrent.ThreadLocalRandom.current().nextInt(), 16);
++ net.minecraft.world.scores.PlayerTeam collideTeam = scoreboard.addPlayerTeam(this.getPlayerList().collideRuleTeamName);
++ collideTeam.setSeeFriendlyInvisibles(false); // Because we want to mimic them not being on a team at all
++ }
++ // Paper end - Configurable player collision
++
+ this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
+ if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
+ this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index 8a91a44e46a2d49e2f4b9e9970c2b77f2e87767e..98862db2334508ee1a783aeabfb146751552a4d9 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -159,6 +159,7 @@ public abstract class PlayerList {
+ // CraftBukkit start
+ private CraftServer cserver;
+ private final Map<String,ServerPlayer> playersByName = new java.util.HashMap<>();
++ public @Nullable String collideRuleTeamName; // Paper - Configurable player collision
+
+ public PlayerList(MinecraftServer server, LayeredRegistryAccess<RegistryLayer> registryManager, PlayerDataStorage saveHandler, int maxPlayers) {
+ this.cserver = server.server = new CraftServer((DedicatedServer) server, this);
+@@ -390,6 +391,13 @@ public abstract class PlayerList {
+
+ player.initInventoryMenu();
+ // CraftBukkit - Moved from above, added world
++ // Paper start - Configurable player collision; Add to collideRule team if needed
++ final net.minecraft.world.scores.Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard();
++ final PlayerTeam collideRuleTeam = scoreboard.getPlayerTeam(this.collideRuleTeamName);
++ if (this.collideRuleTeamName != null && collideRuleTeam != null && player.getTeam() == null) {
++ scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
++ }
++ // Paper end - Configurable player collision
+ PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
+ }
+
+@@ -512,6 +520,16 @@ public abstract class PlayerList {
+ entityplayer.doTick(); // SPIGOT-924
+ // CraftBukkit end
+
++ // Paper start - Configurable player collision; Remove from collideRule team if needed
++ if (this.collideRuleTeamName != null) {
++ final net.minecraft.world.scores.Scoreboard scoreBoard = this.server.getLevel(Level.OVERWORLD).getScoreboard();
++ final PlayerTeam team = scoreBoard.getPlayersTeam(this.collideRuleTeamName);
++ if (entityplayer.getTeam() == team && team != null) {
++ scoreBoard.removePlayerFromTeam(entityplayer.getScoreboardName(), team);
++ }
++ }
++ // Paper end - Configurable player collision
++
+ this.save(entityplayer);
+ if (entityplayer.isPassenger()) {
+ Entity entity = entityplayer.getRootVehicle();
+@@ -1129,6 +1147,13 @@ public abstract class PlayerList {
+ }
+ // CraftBukkit end
+
++ // Paper start - Configurable player collision; Remove collideRule team if it exists
++ if (this.collideRuleTeamName != null) {
++ final net.minecraft.world.scores.Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard();
++ final PlayerTeam team = scoreboard.getPlayersTeam(this.collideRuleTeamName);
++ if (team != null) scoreboard.removePlayerTeam(team);
++ }
++ // Paper end - Configurable player collision
+ }
+
+ // CraftBukkit start