Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-06-21 09:47:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

revert purpur ATs that merged into file commit

Browse Source
This commit is contained in:
granny
2026-06-03 16:38:12 -07:00
parent 1638c22046
commit 74f7affbe6
10 changed files with 3 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch
View File

@@ -1,11 +0,0 @@
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -381,7 +_,7 @@
private final Set<String> tags = new io.papermc.paper.util.SizeLimitedSet<>(new it.unimi.dsi.fastutil.objects.ObjectOpenHashSet<>(), MAX_ENTITY_TAG_COUNT); // Paper - fully limit tag size - replace set impl
private final double[] pistonDeltas = new double[]{0.0, 0.0, 0.0};
private long pistonDeltasGameTime;
- protected EntityDimensions dimensions;
+ private EntityDimensions dimensions;
private float eyeHeight;
public boolean isInPowderSnow;
public boolean wasInPowderSnow;

11
purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntityType.java.patch
View File

@@ -1,11 +0,0 @@
--- a/net/minecraft/world/entity/EntityType.java
+++ b/net/minecraft/world/entity/EntityType.java
@@ -69,7 +_,7 @@
private final String descriptionId;
private @Nullable Component description;
private final Optional<ResourceKey<LootTable>> lootTable;
- public EntityDimensions dimensions;
+ private final EntityDimensions dimensions;
private final float spawnDimensionsScale;
private final FeatureFlagSet requiredFeatures;
private final boolean allowedInPeaceful;

11
purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View File

@@ -1,11 +0,0 @@
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -3914,7 +_,7 @@
}
}
- public boolean canGlide() {
+ protected boolean canGlide() {
if (!this.onGround() && !this.isPassenger() && !this.hasEffect(MobEffects.LEVITATION)) {
for (EquipmentSlot slot : EquipmentSlot.VALUES) {
if (canGlideUsing(this.getItemBySlot(slot), slot)) {

11
purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Shulker.java.patch
View File

@@ -1,11 +0,0 @@
--- a/net/minecraft/world/entity/monster/Shulker.java
+++ b/net/minecraft/world/entity/monster/Shulker.java
@@ -80,7 +_,7 @@
private static final byte DEFAULT_PEEK = 0;
private static final Direction DEFAULT_ATTACH_FACE = Direction.DOWN;
private static final Vector3fc FORWARD = Direction.SOUTH.getUnitVec3f();
- public static final float MAX_SCALE = 3.0F;
+ private static final float MAX_SCALE = 3.0F;
private float currentPeekAmountO;
private float currentPeekAmount;
private @Nullable BlockPos clientOldAttachPosition;

11
purpur-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch
View File

@@ -1,11 +0,0 @@
--- a/net/minecraft/world/entity/player/Player.java
+++ b/net/minecraft/world/entity/player/Player.java
@@ -1529,7 +_,7 @@
}
@Override
- public boolean canGlide() {
+ protected boolean canGlide() {
return !this.abilities.flying && super.canGlide();
}

11
purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ShulkerBoxBlock.java.patch
View File

@@ -1,11 +0,0 @@
--- a/net/minecraft/world/level/block/ShulkerBoxBlock.java
+++ b/net/minecraft/world/level/block/ShulkerBoxBlock.java
@@ -87,7 +_,7 @@
return InteractionResult.SUCCESS;
}
- public static boolean canOpen(final BlockState state, final Level level, final BlockPos pos, final ShulkerBoxBlockEntity blockEntity) {
+ private static boolean canOpen(final BlockState state, final Level level, final BlockPos pos, final ShulkerBoxBlockEntity blockEntity) {
if (blockEntity.getAnimationStatus() != ShulkerBoxBlockEntity.AnimationStatus.CLOSED) {
return true;
}

18
purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java.patch
View File

@@ -9,7 +9,7 @@
private static final int MIN_TICKS_BEFORE_REENTERING_HIVE = 400;
private static final int MIN_OCCUPATION_TICKS_NECTAR = 2400;
public static final int MIN_OCCUPATION_TICKS_NECTARLESS = 600;
@@ -157,11 +_,33 @@
@@ -157,10 +_,32 @@
return spawned;
}
@@ -33,24 +33,12 @@
public int getOccupantCount() {
return this.stored.size();
}
+
+ // Purpur start - Stored Bee API
+ public List<BeeData> getStored() {
+ return stored;
+ }
+ // Purpur end - Stored Bee API
+
// Paper start - Add EntityBlockStorage clearEntities
public void clearBees() {
this.stored.clear();
@@ -390,8 +_,8 @@
registration.register(DebugSubscriptions.BEE_HIVES, () -> DebugHiveInfo.pack(this));
}
- public static class BeeData {
- public final BeehiveBlockEntity.Occupant occupant;
+ private static class BeeData {
+ private final BeehiveBlockEntity.Occupant occupant;
private int exitTickCounter; // Paper - Fix bees aging inside hives; separate counter for checking if bee should exit to reduce exit attempts
private int ticksInHive;

11
purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/entity/FuelValues.java.patch
View File

@@ -1,11 +0,0 @@
--- a/net/minecraft/world/level/block/entity/FuelValues.java
+++ b/net/minecraft/world/level/block/entity/FuelValues.java
@@ -17,7 +_,7 @@
import net.minecraft.world.level.block.Blocks;
public class FuelValues {
- public final Object2IntSortedMap<Item> values;
+ private final Object2IntSortedMap<Item> values;
private FuelValues(final Object2IntSortedMap<Item> values) {
this.values = values;

11
purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/state/BlockBehaviour.java.patch
View File

@@ -1,11 +0,0 @@
--- a/net/minecraft/world/level/block/state/BlockBehaviour.java
+++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
@@ -88,7 +_,7 @@
Direction.WEST, Direction.EAST, Direction.NORTH, Direction.SOUTH, Direction.DOWN, Direction.UP
};
public final boolean hasCollision;
- public float explosionResistance;
+ protected final float explosionResistance;
protected final boolean isRandomlyTicking;
protected final SoundType soundType;
protected final float friction;

11
purpur-server/minecraft-patches/sources/net/minecraft/world/level/portal/PortalShape.java.patch
View File

@@ -1,11 +0,0 @@
--- a/net/minecraft/world/level/portal/PortalShape.java
+++ b/net/minecraft/world/level/portal/PortalShape.java
@@ -29,7 +_,7 @@
public static final int MAX_WIDTH = 21;
private static final int MIN_HEIGHT = 3;
public static final int MAX_HEIGHT = 21;
- public static final BlockBehaviour.StatePredicate FRAME = (state, level, pos) -> state.is(Blocks.OBSIDIAN);
+ private static final BlockBehaviour.StatePredicate FRAME = (state, level, pos) -> state.is(Blocks.OBSIDIAN);
private static final float SAFE_TRAVEL_MAX_ENTITY_XY = 4.0F;
private static final double SAFE_TRAVEL_MAX_VERTICAL_DELTA = 1.0;
private final Direction.Axis axis;