72 lines
4.1 KiB
Diff
72 lines
4.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: AlphaKR93 <dev@alpha93.kr>
|
|
Date: Sat, 2 Nov 2024 15:26:27 +0900
|
|
Subject: [PATCH] mc dev fixes
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/commands/DebugCommand.java b/src/main/java/net/minecraft/server/commands/DebugCommand.java
|
|
index 06568cc308e06b16f43ec7facd5e2c4e36f3fee9..c3374d11753d8cd152784727bf7ed08d18931136 100644
|
|
--- a/src/main/java/net/minecraft/server/commands/DebugCommand.java
|
|
+++ b/src/main/java/net/minecraft/server/commands/DebugCommand.java
|
|
@@ -271,5 +271,12 @@ public class DebugCommand {
|
|
public void close() {
|
|
IOUtils.closeQuietly((Writer)this.output);
|
|
}
|
|
+
|
|
+ // Plazma start - Decompile fixes
|
|
+ @Override
|
|
+ public org.bukkit.command.CommandSender getBukkitSender(final CommandSourceStack wrapper) {
|
|
+ return wrapper.getBukkitSender();
|
|
+ }
|
|
+ // Plazma end - Decompile fixes
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/commands/ReturnCommand.java b/src/main/java/net/minecraft/server/commands/ReturnCommand.java
|
|
index 9f82ca1fee2a319d52a4106c3581f5e9a9554a9e..f5c7748117342dedd9d600881143c206e429fe5b 100644
|
|
--- a/src/main/java/net/minecraft/server/commands/ReturnCommand.java
|
|
+++ b/src/main/java/net/minecraft/server/commands/ReturnCommand.java
|
|
@@ -16,18 +16,18 @@ import net.minecraft.commands.execution.tasks.BuildContexts;
|
|
import net.minecraft.commands.execution.tasks.FallthroughTask;
|
|
|
|
public class ReturnCommand {
|
|
- public static <T extends ExecutionCommandSource<T>> void register(CommandDispatcher<T> dispatcher) {
|
|
- dispatcher.register(
|
|
- (LiteralArgumentBuilder<T>)LiteralArgumentBuilder.<ExecutionCommandSource>literal("return")
|
|
- .requires(source -> source.hasPermission(2))
|
|
- .then(
|
|
- RequiredArgumentBuilder.<T, Integer>argument("value", IntegerArgumentType.integer())
|
|
- .executes(new ReturnCommand.ReturnValueCustomExecutor<>())
|
|
- )
|
|
- .then(LiteralArgumentBuilder.<T>literal("fail").executes(new ReturnCommand.ReturnFailCustomExecutor<>()))
|
|
- .then(LiteralArgumentBuilder.<T>literal("run").forward(dispatcher.getRoot(), new ReturnCommand.ReturnFromCommandCustomModifier<>(), false))
|
|
+
|
|
+ // Plazma start - Decompile fixes
|
|
+ public static void register(CommandDispatcher<net.minecraft.commands.CommandSourceStack> dispatcher) {
|
|
+ dispatcher.register(net.minecraft.commands.Commands.literal("return")
|
|
+ .requires(source -> source.hasPermission(2))
|
|
+ .then(net.minecraft.commands.Commands.argument("value", IntegerArgumentType.integer())
|
|
+ .executes(new ReturnCommand.ReturnValueCustomExecutor<>()))
|
|
+ .then(net.minecraft.commands.Commands.literal("fail").executes(new ReturnCommand.ReturnFailCustomExecutor<>()))
|
|
+ .then(net.minecraft.commands.Commands.literal("run").forward(dispatcher.getRoot(), new ReturnCommand.ReturnFromCommandCustomModifier<>(), false))
|
|
);
|
|
}
|
|
+ // Plazma end - Decompile fixes
|
|
|
|
static class ReturnFailCustomExecutor<T extends ExecutionCommandSource<T>> implements CustomCommandExecutor.CommandAdapter<T> {
|
|
@Override
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/AllayAi.java b/src/main/java/net/minecraft/world/entity/animal/allay/AllayAi.java
|
|
index 3fc1ec01e1a77a169ec762a23f15b97f040ce5f8..b5464708c1fa949e7df8aed71126ccad72d66ee3 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/allay/AllayAi.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/AllayAi.java
|
|
@@ -62,8 +62,8 @@ public class AllayAi {
|
|
Activity.CORE,
|
|
0,
|
|
ImmutableList.of(
|
|
- new Swim<>(0.8F),
|
|
- new AnimalPanic(2.5F),
|
|
+ new Swim<Allay>(0.8F), // Plazma - mc dev fixes
|
|
+ new AnimalPanic<Allay>(2.5F), // Plazma - mc dev fixes
|
|
new LookAtTargetSink(45, 90),
|
|
new MoveToTargetSink(),
|
|
new CountDownCooldownTicks(MemoryModuleType.LIKED_NOTEBLOCK_COOLDOWN_TICKS),
|