mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Preliminary update to 1.17.1
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] Full netherite armor grants fire resistance
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
index d4e6c16b08c5aaf9c50467941498b566f11cc5d2..f4f49b87b615a3c7ef56247896392de93eb1bb0d 100644
|
||||
index fab14cd3148cb81a343b7b1fb4f94da977dba763..6301f71df9573f91040934c85a8530f2cf2bfdad 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
@@ -360,6 +360,16 @@ public abstract class Player extends LivingEntity {
|
||||
@@ -26,10 +26,10 @@ index d4e6c16b08c5aaf9c50467941498b566f11cc5d2..f4f49b87b615a3c7ef56247896392de9
|
||||
|
||||
protected ItemCooldowns createItemCooldowns() {
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index eefa02c1c6b1ec9219bd3d5dc6b28b1851164a6e..b61ae4082a76056b9b8e115eb604e860603da875 100644
|
||||
index 4d978502c426c177a75b92a38b0ee03f38eeb697..5aa1ecf7f9ae3b3ef6157e925bf8e0c750fedea4 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -266,6 +266,19 @@ public class PurpurWorldConfig {
|
||||
@@ -265,6 +265,19 @@ public class PurpurWorldConfig {
|
||||
villageSiegeSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-sieges", predicate);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user