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

update restamp, add back entity ATs, rebuild patches

Browse Source
This commit is contained in:
MiniDigger | Martin
2024-12-15 22:39:52 +01:00
parent acd43900f5
commit 8f1dcdd0b7
6 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
View File

@@ -119,11 +119,11 @@
public double zOld;
public boolean noPhysics;
private boolean wasOnFire;
- protected final RandomSource random = RandomSource.create();
+ protected final RandomSource random = SHARED_RANDOM; // Paper - Share random for entities to make them more random
- public final RandomSource random = RandomSource.create();
+ public final RandomSource random = SHARED_RANDOM; // Paper - Share random for entities to make them more random
public int tickCount;
private int remainingFireTicks = -this.getFireImmuneTicks();
protected boolean wasTouchingWater;
public boolean wasTouchingWater;
@@ -233,7 +_,7 @@
protected UUID uuid = Mth.createInsecureUUID(this.random);
protected String stringUUID = this.uuid.toString();
@@ -341,7 +341,7 @@
@@ -390,6 +_,32 @@
}
protected void setRot(float yRot, float xRot) {
public void setRot(float yRot, float xRot) {
+ // CraftBukkit start - yaw was sometimes set to NaN, so we need to set it back to 0
+ if (Float.isNaN(yRot)) {
+ yRot = 0;
@@ -1193,7 +1193,7 @@
+ // CraftBukkit - end
}
protected boolean getSharedFlag(int flag) {
public boolean getSharedFlag(int flag) {
@@ -2472,7 +_,7 @@
}
@@ -1695,7 +1695,7 @@
+ // Paper end - Folia schedulers
}
protected void unsetRemoved() {
public void unsetRemoved() {
this.removalReason = null;
}

9
paper-server/patches/sources/net/minecraft/world/entity/npc/Villager.java.patch
View File

@@ -88,15 +88,6 @@
double d = 0.3 + 0.0625 * amplifier;
int i = (int)Math.floor(d * merchantOffer1.getBaseCostA().getCount());
merchantOffer1.addToSpecialPriceDiff(-Math.max(i, 1));
@@ -559,7 +_,7 @@
}
@Override
- protected SoundEvent getDeathSound() {
+ public SoundEvent getDeathSound() {
return SoundEvents.VILLAGER_DEATH;
}
@@ -594,7 +_,7 @@
}

9
paper-server/patches/sources/net/minecraft/world/entity/npc/WanderingTrader.java.patch
View File

@@ -70,15 +70,6 @@
}
}
@@ -204,7 +_,7 @@
}
@Override
- protected SoundEvent getDeathSound() {
+ public SoundEvent getDeathSound() {
return SoundEvents.WANDERING_TRADER_DEATH;
}
@@ -241,7 +_,7 @@
private void maybeDespawn() {

2
paper-server/patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch
View File

@@ -52,7 +52,7 @@
@@ -285,7 +_,14 @@
@Nullable
@Override
protected MenuProvider getMenuProvider(BlockState state, Level level, BlockPos pos) {
public MenuProvider getMenuProvider(BlockState state, Level level, BlockPos pos) {
- return this.combine(state, level, pos, false).apply(MENU_PROVIDER_COMBINER).orElse(null);
+ // CraftBukkit start
+ return this.getMenuProvider(state, level, pos, false);