Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update Upstream

Browse Source
This commit is contained in:
lexikiq
2021-06-09 00:30:10 -04:00
parent 91df45a01a
commit 94e5010d31
12 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0007-Add-origin-location-to-EntityDamageByBlockEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add origin location to EntityDamageByBlockEvent
diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
index 53ea8a6d90faf4f7f8fd0819be4499422bdd4cbe..344504de9714c4e5398a0fb32c026045c385383c 100644
index e6bf78f46acc37d9515d58cec3587e236ac0733c..1cea7c5bf99e0c99e8160658df0eab065cca2841 100644
--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java
+++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java
@@ -46,6 +46,16 @@ public class DamageSource {
@@ -25,7 +25,7 @@ index 53ea8a6d90faf4f7f8fd0819be4499422bdd4cbe..344504de9714c4e5398a0fb32c026045
// CraftBukkit start
private boolean sweep;
@@ -108,11 +118,11 @@ public class DamageSource {
@@ -109,11 +119,11 @@ public class DamageSource {
}
public static DamageSource explosion(@Nullable Explosion explosion) {
@@ -39,7 +39,7 @@ index 53ea8a6d90faf4f7f8fd0819be4499422bdd4cbe..344504de9714c4e5398a0fb32c026045
}
public static DamageSource a() {
@@ -233,8 +243,9 @@ public class DamageSource {
@@ -234,8 +244,9 @@ public class DamageSource {
return entity instanceof EntityHuman && ((EntityHuman) entity).abilities.canInstantlyBuild;
}
@@ -69,7 +69,7 @@ index 79008bda42558ea7d28ccf51b66405a3bdb52da7..8fd81f4238416fd6a5d09e3307aebe78
return (ExplosionDamageCalculator) (entity == null ? Explosion.a : new ExplosionDamageCalculatorEntity(entity));
}
diff --git a/src/main/java/net/minecraft/world/level/block/BlockBed.java b/src/main/java/net/minecraft/world/level/block/BlockBed.java
index abe0a1c309d526de37efcac44922fa259e1d112c..0d63e93e4dbcc6abf5ea26ae0a8681531c5685de 100644
index 00a01a157deec004bcf2f8587723a0ecd0bfef85..ece4648bf133621b644291390f5743f9c48c750d 100644
--- a/src/main/java/net/minecraft/world/level/block/BlockBed.java
+++ b/src/main/java/net/minecraft/world/level/block/BlockBed.java
@@ -89,7 +89,12 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
@@ -86,7 +86,7 @@ index abe0a1c309d526de37efcac44922fa259e1d112c..0d63e93e4dbcc6abf5ea26ae0a868153
return EnumInteractionResult.SUCCESS;
} else if ((Boolean) iblockdata.get(BlockBed.OCCUPIED)) {
if (!this.a(world, blockposition)) {
@@ -137,7 +142,12 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
@@ -138,7 +143,12 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
world.a(blockposition1, false);
}
@@ -101,10 +101,10 @@ index abe0a1c309d526de37efcac44922fa259e1d112c..0d63e93e4dbcc6abf5ea26ae0a868153
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index b14cec316b16e46d54d389650372c5c9ce1e5a4d..f0bd5b57ffd7e55299180b382551afe06bd764f8 100644
index a678277416cd71e01cd6980bcfaf9a9803e7ea17..0df40bc18dcd66a367b82e435316851eb99d077c 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -938,7 +938,7 @@ public class CraftEventFactory {
@@ -941,7 +941,7 @@ public class CraftEventFactory {
entityDamage = null;
EntityDamageEvent event;
if (damager == null) {
@@ -113,7 +113,7 @@ index b14cec316b16e46d54d389650372c5c9ce1e5a4d..f0bd5b57ffd7e55299180b382551afe0
} else if (entity instanceof EntityEnderDragon && /*PAIL FIXME ((EntityEnderDragon) entity).target == damager*/ false) {
event = new EntityDamageEvent(entity.getBukkitEntity(), DamageCause.ENTITY_EXPLOSION, modifiers, modifierFunctions);
} else {
@@ -974,7 +974,7 @@ public class CraftEventFactory {
@@ -977,7 +977,7 @@ public class CraftEventFactory {
return callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled);
} else if (source == DamageSource.OUT_OF_WORLD) {