Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.18.2

Browse Source
This commit is contained in:
BillyGalbreath
2022-03-01 17:27:08 -06:00
parent 133b3e1719
commit 90adb4e4af
192 changed files with 1500 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0187-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e414f44168a03874910c5ebdb865fe39d91e27b7..7e85785b902a2ef72c09d53f0e24cb2ab96b0b58 100644
index 539e4080ccd63007999ec2876b272d63e3ba9880..76d953defbef937cca168b1ef38ce22337e48b40 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4461,5 +4461,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -4500,5 +4500,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
public boolean canSaveToDisk() {
return true;
}
@@ -29,10 +29,10 @@ index e414f44168a03874910c5ebdb865fe39d91e27b7..7e85785b902a2ef72c09d53f0e24cb2a
// Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 951e583826598a19e92d3e2a02ebd0c7536460d1..17eb40a73e3d73e2fd24ec411c0d76ebf9ae6490 100644
index 4be548422d14ae4d8800e73c4e91f55f67a1bfee..2773267524a58219876a84aa44b97094e155883a 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity {
@@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity {
public boolean bukkitPickUpLoot;
public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
@@ -40,7 +40,7 @@ index 951e583826598a19e92d3e2a02ebd0c7536460d1..17eb40a73e3d73e2fd24ec411c0d76eb
@Override
public float getBukkitYaw() {
@@ -762,6 +763,7 @@ public abstract class LivingEntity extends Entity {
@@ -765,6 +766,7 @@ public abstract class LivingEntity extends Entity {
dataresult.resultOrPartial(logger::error).ifPresent((nbtbase) -> {
nbt.put("Brain", nbtbase);
});
@@ -48,7 +48,7 @@ index 951e583826598a19e92d3e2a02ebd0c7536460d1..17eb40a73e3d73e2fd24ec411c0d76eb
}
@Override
@@ -837,6 +839,11 @@ public abstract class LivingEntity extends Entity {
@@ -840,6 +842,11 @@ public abstract class LivingEntity extends Entity {
this.brain = this.makeBrain(new Dynamic(NbtOps.INSTANCE, nbt.get("Brain")));
}
@@ -60,7 +60,7 @@ index 951e583826598a19e92d3e2a02ebd0c7536460d1..17eb40a73e3d73e2fd24ec411c0d76eb
}
// CraftBukkit start
@@ -3436,6 +3443,27 @@ public abstract class LivingEntity extends Entity {
@@ -3439,6 +3446,27 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.DROWN, 1.0F);
}
@@ -89,7 +89,7 @@ index 951e583826598a19e92d3e2a02ebd0c7536460d1..17eb40a73e3d73e2fd24ec411c0d76eb
public boolean isSensitiveToWater() {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index e569ca15ded9dc4f85dd9d6431470be6844ed593..1441619edfe075c176ef8e2606eb6f5251558e6c 100644
index a7cb8255cfda572ba77d3350703c03c08d4eaf42..e8c3ff0319ef475bddd110346261ef91a0caabba 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1660,17 +1660,7 @@ public abstract class Mob extends LivingEntity {
@@ -209,7 +209,7 @@ index 065005c13c2bff341402fc962d19148da27bc3c2..e394b6427329f48a85a277eeb8336b12
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
index 5dd3f8df73bb02992b040f14d17c0861d715c5ba..273dc55813aef1a2285ac66703199626cf14c04b 100644
index e7e4d87fb8a5276fd617afc4e0b925100abf3f76..42919b2267eed71e29830a96afdd3be19d6b6f68 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -60,6 +60,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -273,7 +273,7 @@ index 5dd3f8df73bb02992b040f14d17c0861d715c5ba..273dc55813aef1a2285ac66703199626
// Paper end
private static enum AttackPhase {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 4b288fe8923bb4beefb88e8196bfb4d5d2b10b8b..e4e357af439c9a02b8013ce3349ff582495ee80e 100644
index 15bbf62f1dab73b501044c6ada0f6f3b09ab07df..695ff6b65114a2aea761e55d61bea6d49d804f2e 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -93,11 +93,12 @@ public class Zombie extends Monster {
@@ -349,7 +349,7 @@ index 4b288fe8923bb4beefb88e8196bfb4d5d2b10b8b..e4e357af439c9a02b8013ce3349ff582
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index e875bc08aaecc41db09ca0ffa00ff0f1ba40d350..f46ce327586781f74d8feb47e6a904d732888289 100644
index 83c8889137e566322ec4337b0e6d8b940cc2edbe..d575da51b4f1318734ebf26a3730871134e28102 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -199,6 +199,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {