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

Updated Upstream (Paper & Airplane)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
cd6ae8816 Add a "Should Burn in Sunlight" API for Phantoms and Skeletons (#5608)
25edfe58b Remove unneeded component conversion for kick msg (#5626)
cec386f66 Call PortalCreateEvent when players enter the end (#5618)

Airplane Changes:
3dce697cb Fix gradle stuff
209bce3db Patches
This commit is contained in:
BillyGalbreath
2021-05-14 10:45:33 -05:00
parent 44e72f7874
commit ab9b8cabef
25 changed files with 281 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0103-Ridables.patch
View File

@@ -68,7 +68,7 @@ index 0000000000000000000000000000000000000000..8b66d1215a6eef1302b5ecb46a4b3d50
+ }
+}
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
index da708df0dc50ea02441f9db2bfd52f04d9a8e3da..0ed513afdab9b4f8e91b55ffc05f6d26bbd14d22 100644
index e86fb467475bd9ecd607be1a373fe80f905a496c..b16b7fe6fbb39a0dc89da18edbba88714c89fc23 100644
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
@@ -80,7 +80,6 @@ import net.minecraft.server.network.PlayerConnection;
@@ -4229,7 +4229,7 @@ index fe80e93b00f3bb2f297c6528c3951313fa3c08c7..15ed51a2746c09538a425fce25fa25f2
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
index 07ede7b75a65a5815f1ae1ebf03ec0fdb4621afb..1c24a2abe3921fb3cf8341e4fd620d919e2917af 100644
index d19567abb1844295764e6289ca19602809a9b37a..7e5f86a53c3a9efd4bb433f2fe1660a211c74049 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
@@ -13,6 +13,7 @@ import net.minecraft.network.syncher.DataWatcher;
@@ -4334,12 +4334,12 @@ index 07ede7b75a65a5815f1ae1ebf03ec0fdb4621afb..1c24a2abe3921fb3cf8341e4fd620d91
@Override
public void movementTick() {
- if (this.isAlive() && ((world.purpurConfig.phantomBurnInDaylight && this.isInDaylight()) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Purpur
+ if (this.isAlive() && !hasPurpurRider() && ((world.purpurConfig.phantomBurnInDaylight && this.isInDaylight()) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Purpur
- if (this.isAlive() && ((shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight && this.isInDaylight()) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Purpur
+ if (this.isAlive() && !hasPurpurRider() && ((shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight && this.isInDaylight()) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Purpur
this.setOnFire(8);
}
@@ -412,7 +468,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -418,7 +474,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@Override
public boolean a() {
@@ -4348,7 +4348,7 @@ index 07ede7b75a65a5815f1ae1ebf03ec0fdb4621afb..1c24a2abe3921fb3cf8341e4fd620d91
if (this.c > 0) {
--this.c;
return false;
@@ -441,7 +497,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -447,7 +503,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@Override
public boolean b() {
@@ -4357,7 +4357,7 @@ index 07ede7b75a65a5815f1ae1ebf03ec0fdb4621afb..1c24a2abe3921fb3cf8341e4fd620d91
EntityLiving entityliving = EntityPhantom.this.getGoalTarget();
return entityliving != null ? EntityPhantom.this.a(entityliving, PathfinderTargetCondition.a) : false;
@@ -456,7 +512,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -462,7 +518,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@Override
public boolean a() {
@@ -4366,7 +4366,7 @@ index 07ede7b75a65a5815f1ae1ebf03ec0fdb4621afb..1c24a2abe3921fb3cf8341e4fd620d91
EntityLiving entityliving = EntityPhantom.this.getGoalTarget();
return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
@@ -654,14 +710,23 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -660,14 +716,23 @@ public class EntityPhantom extends EntityFlying implements IMonster {
}
}
@@ -4392,7 +4392,7 @@ index 07ede7b75a65a5815f1ae1ebf03ec0fdb4621afb..1c24a2abe3921fb3cf8341e4fd620d91
}
class d extends EntityAIBodyControl {
@@ -677,7 +742,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -683,7 +748,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
}
}
@@ -4401,7 +4401,7 @@ index 07ede7b75a65a5815f1ae1ebf03ec0fdb4621afb..1c24a2abe3921fb3cf8341e4fd620d91
private float j = 0.1F;
@@ -686,7 +751,19 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -692,7 +757,19 @@ public class EntityPhantom extends EntityFlying implements IMonster {
}
@Override
@@ -4672,7 +4672,7 @@ index 342bc9b586ef835e865d6f84bf66f1069ab10f00..0b8517d4e83d14ddf8b6d1f1cf4c538f
protected SoundEffect getSoundAmbient() {
return SoundEffects.ENTITY_SKELETON_AMBIENT;
diff --git a/src/main/java/net/minecraft/world/entity/monster/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/world/entity/monster/EntitySkeletonAbstract.java
index 06d50b22ede102556fdb3e2a6f1424f7ff13f120..7ec60987229927e5fe7164f1d4eae8222832e920 100644
index f8358e40c42f219232bf928f4e0073339a5e19d5..81059fc3fc22f251b5b08f0cd6814a992cff6b1e 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntitySkeletonAbstract.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntitySkeletonAbstract.java
@@ -5,6 +5,7 @@ import java.time.temporal.ChronoField;