1.21.6 dev

Co-authored-by: Bjarne Koll <git@lynxplay.dev>
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
This commit is contained in:
Bjarne Koll
2025-05-28 13:23:32 +02:00
committed by Nassim Jahnke
parent 39203a65e0
commit a24f9b204c
788 changed files with 41006 additions and 6324 deletions

View File

@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/BaseCommandBlock.java
+++ b/net/minecraft/world/level/BaseCommandBlock.java
@@ -37,6 +_,11 @@
@@ -34,6 +_,11 @@
private String command = "";
@Nullable
private Component customName;
@ -12,7 +12,7 @@
public int getSuccessCount() {
return this.successCount;
@@ -114,7 +_,7 @@
@@ -108,7 +_,7 @@
this.successCount++;
}
});
@ -21,7 +21,7 @@
} catch (Throwable var6) {
CrashReport crashReport = CrashReport.forThrowable(var6, "Executing command block");
CrashReportCategory crashReportCategory = crashReport.addCategory("Command to be executed");
@@ -150,6 +_,7 @@
@@ -144,6 +_,7 @@
@Override
public void sendSystemMessage(Component component) {
if (this.trackOutput) {
@ -29,7 +29,7 @@
this.lastOutput = Component.literal("[" + TIME_FORMAT.format(new Date()) + "] ").append(component);
this.onUpdated();
}
@@ -172,7 +_,7 @@
@@ -166,7 +_,7 @@
}
public InteractionResult usedBy(Player player) {
@ -37,4 +37,4 @@
+ if (!player.canUseGameMasterBlocks() && (!player.isCreative() || !player.getBukkitEntity().hasPermission("minecraft.commandblock"))) { // Paper - command block permission
return InteractionResult.PASS;
} else {
if (player.getCommandSenderWorld().isClientSide) {
if (player.level().isClientSide) {