mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes:c40e04e9e7Remove wrong update call in distance map add method58c41d0f60[ci skip] Update log4j-api in Paper-API to 2.17.1 (#7227)fa438331e0[ci skip] Update shadow and remove semicolons from kotlin code8b1734123eFix vanilla LocalMobCapCalculator being used when per-player mob spawning is enabled (#7230)3a43821c38Updated Upstream (Bukkit/CraftBukkit/Spigot)4bf2aef745Validate usernames3c5284dae9Allow . in usernames
This commit is contained in:
@@ -501,10 +501,10 @@ index 610282c7be7355f0800c1265cc8b19dd557d065a..7c52b316c24c8cf55bf4a68337dd7051
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
|
||||
index 75b85b5a6ff38f32d0344a76d9f626c2d8f8077b..63269c9788fdc860fdde79f1bf56f4f3b28dc72f 100644
|
||||
index 5683136ec1ebf6671092a635f026decfc6d7733d..2b8c7458775363813eb6f996a008284f59e0ea40 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
|
||||
@@ -59,6 +59,11 @@ public class SkeletonHorse extends AbstractHorse {
|
||||
@@ -60,6 +60,11 @@ public class SkeletonHorse extends AbstractHorse {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.skeletonHorseTakeDamageFromWater;
|
||||
}
|
||||
@@ -965,10 +965,10 @@ index 1606f15ee56383533b3e2bfca9cf00b63c7c474a..6b450486e50d95a65b3ef8d0521d14e3
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
|
||||
index 626784961ac0ee2de987ee8e5a996683960ff878..fe9acbae2ddf69c97582d283fa3d8a266298df3f 100644
|
||||
index 9ce98a7682d648cf8ba9cb4892b67d764477fbc2..9c0af17c7732216e4c2e9f62fe4523dac0aea8c2 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
|
||||
@@ -78,6 +78,11 @@ public class Vindicator extends AbstractIllager {
|
||||
@@ -79,6 +79,11 @@ public class Vindicator extends AbstractIllager {
|
||||
public boolean isSensitiveToWater() {
|
||||
return this.level.purpurConfig.vindicatorTakeDamageFromWater;
|
||||
}
|
||||
@@ -1125,7 +1125,7 @@ index d3a298734e4434d29b66e94fc6c299d34e0ad432..eb194daac43571a5eb6282c1465a695d
|
||||
|
||||
public static AttributeSupplier.Builder createAttributes() {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
index e95210c6deee2c6431ef01d23953174465f199e0..efb98dd788b5b8ce51c92847c585e5ee9c0465f3 100644
|
||||
index 5b058a8c4ecb7a8b8f5600d761b6df234c35f574..be19a48e9127b24856212ab39a11e00ec1941a52 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
|
||||
@@ -184,6 +184,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
|
||||
|
||||
Reference in New Issue
Block a user