Update to Minecraft 1.20

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-06-08 01:30:00 +10:00
parent bac55e67d6
commit 9d740b84b0
269 changed files with 2605 additions and 2568 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/ItemSign.java
+++ b/net/minecraft/world/item/ItemSign.java
@@ -11,6 +11,8 @@
@@ -13,6 +13,8 @@
public class ItemSign extends ItemBlockWallable {
@@ -9,15 +9,15 @@
public ItemSign(Item.Info item_info, Block block, Block block1) {
super(block, block1, item_info, EnumDirection.DOWN);
}
@@ -20,7 +22,10 @@
boolean flag = super.updateCustomBlockEntityTag(blockposition, world, entityhuman, itemstack, iblockdata);
@@ -35,7 +37,10 @@
if (block instanceof BlockSign) {
BlockSign blocksign = (BlockSign) block;
if (!world.isClientSide && !flag && entityhuman != null) {
- entityhuman.openTextEdit((TileEntitySign) world.getBlockEntity(blockposition));
+ // CraftBukkit start - SPIGOT-4678
+ // entityhuman.openTextEdit((TileEntitySign) world.getBlockEntity(blockposition));
+ ItemSign.openSign = blockposition;
+ // CraftBukkit end
- blocksign.openTextEdit(entityhuman, tileentitysign, true);
+ // CraftBukkit start - SPIGOT-4678
+ // blocksign.openTextEdit(entityhuman, tileentitysign, true);
+ ItemSign.openSign = blockposition;
+ // CraftBukkit end
}
}
}
return flag;