SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

it compiles?

Browse Source
This commit is contained in:
Jake Potrebic
2024-12-15 14:35:59 -08:00
parent 9bb6731cc4
commit 4cc2be301d
7 changed files with 95 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/patches/sources/net/minecraft/world/entity/monster/Spider.java.patch
View File

@@ -5,7 +5,7 @@
super.tick();
if (!this.level().isClientSide) {
- this.setClimbing(this.horizontalCollision);
+ this.setClimbing(this.horizontalCollision && (this.level().paperConfig().entities.behavior.allowSpiderWorldBorderClimbing || !(ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.isCollidingWithBorder(this.level().getWorldBorder(), this.getBoundingBox().inflate(ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_EPSILON)) && this.level().getWorldBorder().isInsideCloseToBorder(this, this.getBoundingBox())))); // Paper - Add config option for spider worldborder climbing (Inflate by +EPSILON as collision will just barely place us outside border)
+ this.setClimbing(this.horizontalCollision && (this.level().paperConfig().entities.behavior.allowSpiderWorldBorderClimbing || !(io.papermc.paper.FeatureHooks.isSpiderCollidingWithWorldBorder(this) && this.level().getWorldBorder().isInsideCloseToBorder(this, this.getBoundingBox())))); // Paper - Add config option for spider worldborder climbing (Inflate by +EPSILON as collision will just barely place us outside border)
}
}

55
paper-server/patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch
View File

@@ -8,10 +8,25 @@
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
@@ -74,6 +_,16 @@
@@ -63,16 +_,26 @@
protected int inGroundTime;
public AbstractArrow.Pickup pickup = AbstractArrow.Pickup.DISALLOWED;
public int shakeTime;
- private int life;
+ public int life; // Paper - private -> public
private double baseDamage = 2.0;
- private SoundEvent soundEvent = this.getDefaultHitGroundSoundEvent();
+ public SoundEvent soundEvent = this.getDefaultHitGroundSoundEvent(); // Paper - private -> public
@Nullable
private ItemStack firedFromWeapon = null;
private IntOpenHashSet piercingIgnoreEntityIds;
@Nullable
private List<Entity> piercedAndKilledEntities;
- private ItemStack pickupItemStack = this.getDefaultPickupItem();
+ public ItemStack pickupItemStack = this.getDefaultPickupItem(); // Paper - private -> public
@Nullable
- private ItemStack firedFromWeapon = null;
+ public ItemStack firedFromWeapon = null; // Paper - private -> public
+
+ // Spigot Start
+ @Override
+ public void inactiveTick() {
@@ -21,10 +36,9 @@
+ super.inactiveTick();
+ }
+ // Spigot End
+
protected AbstractArrow(EntityType<? extends AbstractArrow> entityType, Level level) {
super(entityType, level);
}
@@ -87,7 +_,13 @@
ItemStack pickupItemStack,
@Nullable ItemStack firedFromWeapon
@@ -231,3 +245,34 @@
}
}
}
@@ -643,7 +_,7 @@
};
}
- protected ItemStack getPickupItem() {
+ public ItemStack getPickupItem() { // Paper - protected -> public
return this.pickupItemStack.copy();
}
@@ -675,7 +_,7 @@
this.setFlag(1, critArrow);
}
- private void setPierceLevel(byte pierceLevel) {
+ public void setPierceLevel(byte pierceLevel) { // Paper - private -> public
this.entityData.set(PIERCE_LEVEL, pierceLevel);
}
@@ -687,6 +_,12 @@
this.entityData.set(ID_FLAGS, (byte)(b & ~id));
}
}
+
+ // Paper start
+ public void setPickupItemStackPublic(final ItemStack pickupItemStack) {
+ this.setPickupItemStack(pickupItemStack);
+ }
+ // Paper end
protected void setPickupItemStack(ItemStack pickupItemStack) {
if (!pickupItemStack.isEmpty()) {