Allow Transparent Blocks In Enchanting Box (#1161)

Co-authored-by: granny <granny@purpurmc.org>
This commit is contained in:
Rhythmic (Illo)
2022-10-25 01:26:55 -07:00
committed by GitHub
parent e68ea51da7
commit 20b745d96a
13 changed files with 86 additions and 45 deletions

View File

@@ -754,7 +754,7 @@ index 550c3566b14aace0dbd4e77876abc2bb663bcf5c..c888e654ab9449bfdc7dfe16078eb078
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 99ae8f9179a85d11abc797cdf3e5a9846082d82e..2f6bb9c37818824779170c784132673d43b70979 100644
index 0d50fdc47564ee6d72fefdbf44b76937ea5383d4..8903d7679feadf35d0b33e39ce0b1a6907ffb5e5 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1157,7 +1157,7 @@ public class ServerPlayer extends Player {
@@ -1139,10 +1139,10 @@ index cd97d28e85a6795099ec314e9574aa413ff93156..30cbbdd312d7cc34db7b281524adb5aa
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f994765477f01e8c6 100644
index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996dc9cd35a 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -397,7 +397,7 @@ public abstract class LivingEntity extends Entity {
@@ -396,7 +396,7 @@ public abstract class LivingEntity extends Entity {
}
super.baseTick();
@@ -1151,7 +1151,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547
if (this.fireImmune() || this.level.isClientSide) {
this.clearFire();
}
@@ -501,7 +501,7 @@ public abstract class LivingEntity extends Entity {
@@ -500,7 +500,7 @@ public abstract class LivingEntity extends Entity {
this.yHeadRotO = this.yHeadRot;
this.yRotO = this.getYRot();
this.xRotO = this.getXRot();
@@ -1160,7 +1160,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3089,10 +3089,10 @@ public abstract class LivingEntity extends Entity {
@@ -3088,10 +3088,10 @@ public abstract class LivingEntity extends Entity {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1174,7 +1174,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3104,7 +3104,7 @@ public abstract class LivingEntity extends Entity {
@@ -3103,7 +3103,7 @@ public abstract class LivingEntity extends Entity {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1183,7 +1183,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3386,19 +3386,19 @@ public abstract class LivingEntity extends Entity {
@@ -3385,19 +3385,19 @@ public abstract class LivingEntity extends Entity {
}
this.setDeltaMovement(d4, d5, d6);
@@ -1208,7 +1208,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547
if (this.jumping && this.isAffectedByFluids()) {
double d7;
@@ -3425,8 +3425,8 @@ public abstract class LivingEntity extends Entity {
@@ -3424,8 +3424,8 @@ public abstract class LivingEntity extends Entity {
this.noJumpDelay = 0;
}
@@ -1219,7 +1219,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3435,8 +3435,8 @@ public abstract class LivingEntity extends Entity {
@@ -3434,8 +3434,8 @@ public abstract class LivingEntity extends Entity {
// SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper
this.travel(new Vec3((double) this.xxa, (double) this.yya, (double) this.zza));
// SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper
@@ -1230,7 +1230,7 @@ index f962e6e2686597dba34d4444704d95dff8ab2d20..0e3db206fc6c8f550cea9a2f99476547
boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
int i;
@@ -3456,15 +3456,15 @@ public abstract class LivingEntity extends Entity {
@@ -3455,15 +3455,15 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.FREEZE, (float) i);
}