Update upstream

This commit is contained in:
Cryptite
2024-02-13 21:54:38 -06:00
parent e495d7551a
commit e62b92a5fe
17 changed files with 51 additions and 51 deletions

View File

@@ -27,10 +27,10 @@ index 5ece375eaf6bcc61864997a389bb5e24625e4505..2d61315c9ab87a216e235f1586618b11
return false;
} else {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 8f437225d2a4e08ca47873cd42277d9f0f9f5529..dbeaec6c95be922ab17ce6e919dfd5dc6f618804 100644
index 19f23a6c8fb5c02843c27fb8a242ec9d0d1b538b..d2ca67b1a9468b4b5a9f2e388310715e86695501 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -901,12 +901,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -896,12 +896,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
@Override
@@ -46,7 +46,7 @@ index 8f437225d2a4e08ca47873cd42277d9f0f9f5529..dbeaec6c95be922ab17ce6e919dfd5dc
// CraftBukkit start - tree generation
if (this.captureTreeGeneration) {
// Paper start - Protect Bedrock and End Portal/Frames from being destroyed
@@ -1102,7 +1102,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1097,7 +1097,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
iblockdata.getBlock().popExperience((ServerLevel) this, pos, xp, breakingEntity); // Paper - Properly handle xp dropping; custom amount
}
@@ -77,7 +77,7 @@ index 134e5ec79bf2dddd4e31930f8a7cb2c02fa29518..fd72d278a2719911a46b6bc9e7da2dc2
boolean removeBlock(BlockPos pos, boolean move);
diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
index 73d6f881a7d4d8ff96040d34ac502e5b0937d577..f9f147861359258c02fd5f99008a3ab8a6e466c0 100644
index 22036ed3ea0629bc12981a8d91a03e55cc2117d6..4dcbaddc99225e8cfe9b8dbbf2196bfca9d057f6 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -201,7 +201,7 @@ public class Block extends BlockBehaviour implements ItemLike {