mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 02:17:42 +01:00
Rebase on latest Purpur (#230)
This commit is contained in:
@@ -52,10 +52,10 @@ index 2c983e6a092464d1867fcbe875b2e1461ec8556b..a92c900a6092c07b34711428fac268f4
|
||||
|
||||
this.a(damagesource);
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index b49a909bf1dcf0bebce3eec03b54d05583af2e43..16eac6648c7bb17fb10f5741857ac5e8283aed50 100644
|
||||
index c9ef027ed3785de20155e27c6e8cc8e3f7112ce0..593dfa8fdfbceb74bcc78072ac5c6e7df8ded242 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -1915,4 +1915,33 @@ public class PurpurWorldConfig {
|
||||
@@ -1927,4 +1927,33 @@ public class PurpurWorldConfig {
|
||||
private void imposeTeleportRestrictionsOnGateways() {
|
||||
imposeTeleportRestrictionsOnGateways = getBoolean("gameplay-mechanics.impose-teleport-restrictions-on-gateways", imposeTeleportRestrictionsOnGateways);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user