Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add back Tuinity

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-24 17:26:08 -05:00
parent f790e54b7a
commit 0650816cca
68 changed files with 316 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0204-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 714749691ab1252aea682eb1222c76d307ae1fe7..28530a6b3b55d51f03df02a504900ccf83a11de7 100644
index ef4a8b0a072cb6350fd0102417d94ea2c222d5dc..e78dad0ac30c8b5eb89c5780104c159701af5dfd 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4082,5 +4082,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -4275,5 +4275,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
public boolean canSaveToDisk() {
return true;
}
@@ -89,10 +89,10 @@ index 521a353a1de6573b7e4fcebc673494cdb93d7815..c4865a08e40205bd17697b039769fd86
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 d92549e81160afaa1d109501806f3af96c475d7e..c5fa64b2d1559bf47b3dac8a2a10205e93e638dd 100644
index b057284fea2fc32e300183ee1db29173efa6d490..dcec19d6323697f8469a7f595e989954c5e3f224 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1629,17 +1629,7 @@ public abstract class Mob extends LivingEntity {
@@ -1634,17 +1634,7 @@ public abstract class Mob extends LivingEntity {
}
public boolean isSunBurnTick() {
@@ -112,7 +112,7 @@ index d92549e81160afaa1d109501806f3af96c475d7e..c5fa64b2d1559bf47b3dac8a2a10205e
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
index 74f4f8e1c9faef3b50fa817ca3dfbb6b19b1622d..9c74969267d14b5c41187ef4182f56020af9685a 100644
index 74f4f8e1c9faef3b50fa817ca3dfbb6b19b1622d..5b19d8db09867791782c899d41d314c511f6c8a2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
@@ -65,6 +65,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
@@ -161,7 +161,15 @@ index 74f4f8e1c9faef3b50fa817ca3dfbb6b19b1622d..9c74969267d14b5c41187ef4182f5602
super.aiStep();
}
@@ -233,7 +213,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
@@ -189,7 +169,6 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
} else {
this.goalSelector.addGoal(4, this.meleeGoal);
}
-
}
}
@@ -233,7 +212,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
this.reassessWeaponGoal();
// Paper start
if (nbt.contains("Paper.ShouldBurnInDay")) {
@@ -170,7 +178,7 @@ index 74f4f8e1c9faef3b50fa817ca3dfbb6b19b1622d..9c74969267d14b5c41187ef4182f5602
}
// Paper end
}
@@ -242,7 +222,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
@@ -242,7 +221,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
@Override
public void addAdditionalSaveData(CompoundTag nbt) {
super.addAdditionalSaveData(nbt);
@@ -325,10 +333,10 @@ index b80f7c71cbf7b10bda6fac3cfe673ac7fe129923..5adef472e37b422c9b83ac00221be3fb
// 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 e2b1574af471699f93956130b50268647f24e0b9..c5733b0d9d4de696421a30b5d7266334af004c3b 100644
index 1035e023003521574a09fdea3fd08e5fca66d8fc..7484f9c13e41f9be305134595b7052dfff4d72c3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1240,5 +1240,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1249,5 +1249,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
entity.absMoveTo(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
return !entity.valid && entity.level.addEntity(entity, spawnReason);
}