Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
9b0a0d8 Add the default tick rate of the sensor to the timings (#6242)
e905eb1 Add fireball to default max load config (#6252)
2f1f1b7 Add config option to specify timings url (#6256)
efd7e51 Move "use-display-name-in-quit-message" to settings namespace (#6257)
b32a3b1 Call EntityKnockbackByEntityEvent for RamTarget Behavior (#6273)
This commit is contained in:
William Blake Galbreath
2021-07-26 21:41:58 -05:00
parent f482d19d56
commit b2056c256f
28 changed files with 100 additions and 89 deletions

View File

@@ -40,10 +40,10 @@ index 0fcd6a9162f5bddb3c4fc42b3a64efde7c7d9a9b..b7116c40b22c4c614ba74232a18c216d
this.entity.stopSeenByPlayer(player);
player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()}));
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 0f94bcb6e728f4ad365ed5a51d7562182ad1031d..f01f3628894a9491ef03c662feee49ccdf871519 100644
index ce0648631f5a63d4872e04f6615ca097be5f3d17..cc1b102949e9236b8b7960e76f712348c9e02022 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -210,6 +210,11 @@ public class PurpurConfig {
@@ -217,6 +217,11 @@ public class PurpurConfig {
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
}