Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 05:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix scuffed patches

Browse Source
This commit is contained in:
Owen1212055 2023-06-08 03:57:42 -04:00
parent 8bab352ff6
commit fa4aae5fff
2 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/Detail-more-information-in-watchdog-dumps.patch
View File

@ -169,7 +169,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z); this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
} else { } else {
@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return false; this.level().getProfiler().pop();
} }
} }
+ // Paper start - detailed watchdog information + // Paper start - detailed watchdog information
@ -181,7 +181,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper end - detailed watchdog information + // Paper end - detailed watchdog information
} }
protected boolean isHorizontalCollisionMinor(Vec3 adjustedMovement) { private boolean isStateClimbable(BlockState state) {
@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
} }

26
patches/server/Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
View File

@ -1273,32 +1273,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
- this.level().getProfiler().pop(); - this.level().getProfiler().pop();
- }
- }
- }
-
- private boolean isStateClimbable(BlockState state) {
- return state.is(BlockTags.CLIMBABLE) || state.is(Blocks.POWDER_SNOW);
- }
-
- private boolean vibrationAndSoundEffectsFromBlock(BlockPos pos, BlockState state, boolean playSound, boolean emitEvent, Vec3 movement) {
- if (state.isAir()) {
- return false;
- } else {
- boolean flag2 = this.isStateClimbable(state);
-
- if ((this.onGround() || flag2 || this.isCrouching() && movement.y == 0.0D || this.isOnRails()) && !this.isSwimming()) {
- if (playSound) {
- this.walkingStepSound(pos, state);
- }
-
- if (emitEvent) {
- this.level().gameEvent(GameEvent.STEP, this.position(), GameEvent.Context.of(this, state));
- }
-
- return true;
- } else {
- return false;
+ this.level.getProfiler().pop(); + this.level.getProfiler().pop();
} }
} }