2019-01-02 19:10:14 +01:00
From 719b9b1643a33cf1def7c539971a09b602bd81e4 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
2019-01-02 19:10:14 +01:00
index 0778f53e2a..30fcf4a728 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
2018-10-19 02:44:59 +02:00
@@ -233,4 +233,9 @@ public class PaperConfig {
2018-07-15 03:53:17 +02:00
private static void regionFileCacheSize() {
regionFileCacheSize = getInt("settings.region-file-cache-size", 256);
}
+
+ 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
2019-01-02 19:10:14 +01:00
index c21ebd4668..862c5d66b7 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
2019-01-01 04:15:55 +01:00
@@ -420,6 +420,19 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
2018-08-26 20:11:49 +02:00
this.a(this.getWorldServer(DimensionManager.OVERWORLD).worldMaps);
// CraftBukkit end
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
}
protected void a(File file, WorldData worlddata) {
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
2019-01-02 19:10:14 +01:00
index a6aed2531f..575e3762b2 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
2019-01-01 04:15:55 +01:00
@@ -94,7 +94,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
2019-01-02 19:10:14 +01:00
index 5236948990..79641a73a8 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
2019-01-01 04:15:55 +01:00
@@ -73,6 +73,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
public PlayerList(MinecraftServer minecraftserver) {
this.cserver = minecraftserver.server = new CraftServer(minecraftserver, this);
2019-01-01 04:15:55 +01:00
@@ -230,6 +231,13 @@ public abstract class PlayerList {
2018-07-15 03:53:17 +02:00
}
entityplayer.syncInventory();
+ // Paper start - Add to collideRule team if needed
2018-08-26 20:11:49 +02:00
+ final Scoreboard scoreboard = this.getServer().getWorldServer(DimensionManager.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
2018-12-08 11:09:55 +01:00
PlayerList.f.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", entityplayer.getDisplayName().getString(), s1, entityplayer.getId(), entityplayer.world.worldData.getName(), entityplayer.locX, entityplayer.locY, entityplayer.locZ);
2018-07-15 03:53:17 +02:00
}
2019-01-01 04:15:55 +01:00
@@ -423,6 +431,16 @@ public abstract class PlayerList {
2018-07-15 03:53:17 +02:00
entityplayer.playerTick();// SPIGOT-924
// CraftBukkit end
+ // Paper start - Remove from collideRule team if needed
+ if (this.collideRuleTeamName != null) {
2018-08-26 20:11:49 +02:00
+ final Scoreboard scoreBoard = this.server.getWorldServer(DimensionManager.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();
2019-01-02 19:10:14 +01:00
@@ -1309,7 +1327,13 @@ public abstract class PlayerList {
2018-07-15 03:53:17 +02:00
player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
}
// CraftBukkit end
-
+ // Paper start - Remove collideRule team if it exists
+ if (this.collideRuleTeamName != null) {
2018-08-26 20:11:49 +02:00
+ final Scoreboard scoreboard = this.getServer().getWorldServer(DimensionManager.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
--
2019-01-01 04:15:55 +01:00
2.20.1
2018-07-15 03:53:17 +02:00