add back Optimize collision to not load chunks

1 files changed, 0 insertions, 131 deletions

diff --git a/patches/server/0523-Beacon-API-custom-effect-ranges.patch b/patches/server/0523-Beacon-API-custom-effect-ranges.patch
deleted file mode 100644
index 6da9cb0f32..0000000000
--- a/patches/server/0523-Beacon-API-custom-effect-ranges.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Wed, 24 Jun 2020 12:39:08 -0600
-Subject: [PATCH] Beacon API - custom effect ranges
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 76a401bcfdacded2137142ed38d739ed65d9fae6..008d486f4166d9f384e3aab48af6d66a255f3564 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-@@ -78,6 +78,26 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
-         return (BeaconBlockEntity.hasSecondaryEffect(this.levels, this.primaryPower, this.secondaryPower)) ? CraftPotionUtil.toBukkit(new MobEffectInstance(this.secondaryPower, BeaconBlockEntity.getLevel(this.levels), BeaconBlockEntity.getAmplification(this.levels, this.primaryPower, this.secondaryPower), true, true)) : null;
-     }
-     // CraftBukkit end
-+    // Paper start - add field/methods for custom range
-+    private final String PAPER_RANGE_TAG = "Paper.Range";
-+    private double effectRange = -1;
-+
-+    public double getEffectRange() {
-+        if (this.effectRange < 0) {
-+            return this.levels * 10 + 10;
-+        } else {
-+            return effectRange;
-+        }
-+    }
-+
-+    public void setEffectRange(double range) {
-+        this.effectRange = range;
-+    }
-+
-+    public void resetEffectRange() {
-+        this.effectRange = -1;
-+    }
-+    // Paper end
- 
-     public BeaconBlockEntity(BlockPos pos, BlockState state) {
-         super(BlockEntityType.BEACON, pos, state);
-@@ -181,7 +201,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
-             }
- 
-             if (blockEntity.levels > 0 && !blockEntity.beamSections.isEmpty()) {
--                BeaconBlockEntity.applyEffects(world, pos, blockEntity.levels, blockEntity.primaryPower, blockEntity.secondaryPower);
-+                BeaconBlockEntity.applyEffects(world, pos, blockEntity.levels, blockEntity.primaryPower, blockEntity.secondaryPower, blockEntity); // Paper
-                 BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT);
-             }
-         }
-@@ -267,8 +287,13 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
-     }
- 
-     public static List getHumansInRange(Level world, BlockPos blockposition, int i) {
-+        // Paper start
-+        return BeaconBlockEntity.getHumansInRange(world, blockposition, i, null);
-+    }
-+    public static List getHumansInRange(Level world, BlockPos blockposition, int i, @Nullable BeaconBlockEntity blockEntity) {
-+        // Paper end
-         {
--            double d0 = (double) (i * 10 + 10);
-+            double d0 = blockEntity != null ? blockEntity.getEffectRange() : (i * 10 + 10);// Paper - custom beacon ranges
- 
-             AABB axisalignedbb = (new AABB(blockposition)).inflate(d0).expandTowards(0.0D, (double) world.getHeight(), 0.0D);
-             List<Player> list = world.getEntitiesOfClass(Player.class, axisalignedbb);
-@@ -309,12 +334,17 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
-     }
- 
-     private static void applyEffects(Level world, BlockPos pos, int beaconLevel, @Nullable MobEffect primaryEffect, @Nullable MobEffect secondaryEffect) {
-+        // Paper start
-+        BeaconBlockEntity.applyEffects(world, pos, beaconLevel, primaryEffect, secondaryEffect, null);
-+    }
-+    private static void applyEffects(Level world, BlockPos pos, int beaconLevel, @Nullable MobEffect primaryEffect, @Nullable MobEffect secondaryEffect, @Nullable BeaconBlockEntity blockEntity) {
-+        // Paper end
-         if (!world.isClientSide && primaryEffect != null) {
-             double d0 = (double) (beaconLevel * 10 + 10);
-             byte b0 = BeaconBlockEntity.getAmplification(beaconLevel, primaryEffect, secondaryEffect);
- 
-             int j = BeaconBlockEntity.getLevel(beaconLevel);
--            List list = BeaconBlockEntity.getHumansInRange(world, pos, beaconLevel);
-+            List list = BeaconBlockEntity.getHumansInRange(world, pos, beaconLevel, blockEntity); // Paper
- 
-             BeaconBlockEntity.applyEffect(list, primaryEffect, j, b0, true, pos); // Paper - BeaconEffectEvent
- 
-@@ -364,6 +394,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
-         }
- 
-         this.lockKey = LockCode.fromTag(nbt);
-+        this.effectRange = nbt.contains(PAPER_RANGE_TAG, 6) ? nbt.getDouble(PAPER_RANGE_TAG) : -1; // Paper
-     }
- 
-     @Override
-@@ -377,6 +408,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
-         }
- 
-         this.lockKey.addToTag(nbt);
-+        nbt.putDouble(PAPER_RANGE_TAG, this.effectRange); // Paper
-     }
- 
-     public void setCustomName(@Nullable Component customName) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
-index c186a44b927188ed222f8b2f8f76aaef35d9c654..c47e613cae3d9252a8364ccc4d717e410bb0fc0c 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
-@@ -29,7 +29,7 @@ public class CraftBeacon extends CraftBlockEntityState<BeaconBlockEntity> implem
-         if (tileEntity instanceof BeaconBlockEntity) {
-             BeaconBlockEntity beacon = (BeaconBlockEntity) tileEntity;
- 
--            Collection<Player> nms = BeaconBlockEntity.getHumansInRange(beacon.getLevel(), beacon.getBlockPos(), beacon.levels);
-+            Collection<Player> nms = BeaconBlockEntity.getHumansInRange(beacon.getLevel(), beacon.getBlockPos(), beacon.levels, beacon); // Paper
-             Collection<LivingEntity> bukkit = new ArrayList<LivingEntity>(nms.size());
- 
-             for (Player human : nms) {
-@@ -106,4 +106,21 @@ public class CraftBeacon extends CraftBlockEntityState<BeaconBlockEntity> implem
-     public void setLock(String key) {
-         this.getSnapshot().lockKey = (key == null) ? LockCode.NO_LOCK : new LockCode(key);
-     }
-+
-+    // Paper start
-+    @Override
-+    public double getEffectRange() {
-+        return this.getSnapshot().getEffectRange();
-+    }
-+
-+    @Override
-+    public void setEffectRange(double range) {
-+        this.getSnapshot().setEffectRange(range);
-+    }
-+
-+    @Override
-+    public void resetEffectRange() {
-+        this.getSnapshot().resetEffectRange();
-+    }
-+    // Paper end
- }