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

[ci-skip] remove extra unused import from last commit

Browse Source
This commit is contained in:
BillyGalbreath
2022-09-19 19:35:19 -05:00
parent 3d026d9a11
commit f166b46032
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0219-Conduit-behavior-configuration.patch
View File

@@ -5,18 +5,10 @@ Subject: [PATCH] Conduit behavior configuration
diff --git a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
index 05eab04e4aec4151018f25b59f92ddbbb4c09f87..8720ff5c7a1a05b8c7093bb618278685b29b2872 100644
index 05eab04e4aec4151018f25b59f92ddbbb4c09f87..3b5c502fc211940dd908f1d276fa11e3826abda7 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java
@@ -9,6 +9,7 @@ import net.minecraft.core.BlockPos;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
+import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
@@ -172,7 +173,7 @@ public class ConduitBlockEntity extends BlockEntity {
@@ -172,7 +172,7 @@ public class ConduitBlockEntity extends BlockEntity {
if ((l > 1 || i1 > 1 || j1 > 1) && (i == 0 && (i1 == 2 || j1 == 2) || j == 0 && (l == 2 || j1 == 2) || k == 0 && (l == 2 || i1 == 2))) {
BlockPos blockposition2 = pos.offset(i, j, k);
BlockState iblockdata = world.getBlockState(blockposition2);
@@ -25,7 +17,7 @@ index 05eab04e4aec4151018f25b59f92ddbbb4c09f87..8720ff5c7a1a05b8c7093bb618278685
int k1 = ablock.length;
for (int l1 = 0; l1 < k1; ++l1) {
@@ -192,7 +193,7 @@ public class ConduitBlockEntity extends BlockEntity {
@@ -192,7 +192,7 @@ public class ConduitBlockEntity extends BlockEntity {
private static void applyEffects(Level world, BlockPos pos, List<BlockPos> activatingBlocks) {
int i = activatingBlocks.size();
@@ -34,7 +26,7 @@ index 05eab04e4aec4151018f25b59f92ddbbb4c09f87..8720ff5c7a1a05b8c7093bb618278685
int k = pos.getX();
int l = pos.getY();
int i1 = pos.getZ();
@@ -223,21 +224,21 @@ public class ConduitBlockEntity extends BlockEntity {
@@ -223,21 +223,21 @@ public class ConduitBlockEntity extends BlockEntity {
blockEntity.destroyTarget = ConduitBlockEntity.findDestroyTarget(world, pos, blockEntity.destroyTargetUUID);
blockEntity.destroyTargetUUID = null;
} else if (blockEntity.destroyTarget == null) {
@@ -59,7 +51,7 @@ index 05eab04e4aec4151018f25b59f92ddbbb4c09f87..8720ff5c7a1a05b8c7093bb618278685
world.playSound((Player) null, blockEntity.destroyTarget.getX(), blockEntity.destroyTarget.getY(), blockEntity.destroyTarget.getZ(), SoundEvents.CONDUIT_ATTACK_TARGET, SoundSource.BLOCKS, 1.0F, 1.0F);
}
CraftEventFactory.blockDamage = null;
@@ -263,16 +264,22 @@ public class ConduitBlockEntity extends BlockEntity {
@@ -263,16 +263,22 @@ public class ConduitBlockEntity extends BlockEntity {
}
private static AABB getDestroyRangeAABB(BlockPos pos) {