Add Pufferfish Patches

This commit is contained in:
BillyGalbreath
2022-01-04 23:14:55 -06:00
parent 468a199184
commit ed169a31bd
127 changed files with 4975 additions and 379 deletions

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 f15cce18d4cfb56d8b54bb8f50af206ad48f8cd1..2673c49e46e0acbac413feec146000d535721404 100644
index ffe4024267f432c9eba37a6712e444e55c69799d..1e4d6c36576ebfc9ff643d87d73ee6a908a06876 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4352,5 +4352,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -4431,5 +4431,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
public boolean canSaveToDisk() {
return true;
}
@@ -29,10 +29,10 @@ index f15cce18d4cfb56d8b54bb8f50af206ad48f8cd1..2673c49e46e0acbac413feec146000d5
// 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 a8702eafb732944d189e386646ed219113c1d811..ea66ac3bbf619feec50e3e73c60f25c14356abbb 100644
index b7d580fc174b69c23dbbc18e114f3d3119a8e9ea..bf01f496e2b89f6fbd44d845a12cdfaed41e5f13 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity {
@@ -261,6 +261,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 a8702eafb732944d189e386646ed219113c1d811..ea66ac3bbf619feec50e3e73c60f25c1
@Override
public float getBukkitYaw() {
@@ -765,6 +766,7 @@ public abstract class LivingEntity extends Entity {
@@ -763,6 +764,7 @@ public abstract class LivingEntity extends Entity {
dataresult.resultOrPartial(logger::error).ifPresent((nbtbase) -> {
nbt.put("Brain", nbtbase);
});
@@ -48,7 +48,7 @@ index a8702eafb732944d189e386646ed219113c1d811..ea66ac3bbf619feec50e3e73c60f25c1
}
@Override
@@ -840,6 +842,11 @@ public abstract class LivingEntity extends Entity {
@@ -838,6 +840,11 @@ public abstract class LivingEntity extends Entity {
this.brain = this.makeBrain(new Dynamic(NbtOps.INSTANCE, nbt.get("Brain")));
}
@@ -60,7 +60,7 @@ index a8702eafb732944d189e386646ed219113c1d811..ea66ac3bbf619feec50e3e73c60f25c1
}
// CraftBukkit start
@@ -3408,6 +3415,27 @@ public abstract class LivingEntity extends Entity {
@@ -3429,6 +3436,27 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.DROWN, 1.0F);
}
@@ -89,10 +89,10 @@ index a8702eafb732944d189e386646ed219113c1d811..ea66ac3bbf619feec50e3e73c60f25c1
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 afb05e183908f720546ace65ddaab45cc2d75525..1d1492f2b705f6d0138b747206a381c8d038c3fa 100644
index 4d2ed6947d661d0f40c9a40824cbd957806c5a3a..fd8c372169ebbca95ffdf23dc1a7d61bee420ed2 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1658,17 +1658,7 @@ public abstract class Mob extends LivingEntity {
@@ -1662,17 +1662,7 @@ public abstract class Mob extends LivingEntity {
}
public boolean isSunBurnTick() {