37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
|
From c5a82d76a6bd15edc09baaf57f8d4df6d8cd5d76 Mon Sep 17 00:00:00 2001
|
||
|
|
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
|
||
|
|
index cd25fb8..a07ee75 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
@@ -190,4 +190,9 @@ public class PaperConfig {
|
||
|
|
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/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
|
||
|
|
index f86bf8d..766b764 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
|
||
|
|
@@ -96,7 +96,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
|
||
|
|
packetdataserializer.a(this.d);
|
||
|
|
packetdataserializer.writeByte(this.j);
|
||
|
|
packetdataserializer.a(this.e);
|
||
|
|
- packetdataserializer.a(this.f);
|
||
|
|
+ packetdataserializer.a(!com.destroystokyo.paper.PaperConfig.enablePlayerCollisions ? "never" : this.f); // Paper
|
||
|
|
packetdataserializer.writeByte(this.g);
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.8.0
|
||
|
|
|