3f15d7a684
Upstream has released updates that appear to apply and compile correctly. [Purpur Changes] PurpurMC/Purpur@e86a1b6: Updated Upstream (Paper) PurpurMC/Purpur@962ee30: Updated Upstream (Paper) PurpurMC/Purpur@74d1b4c: Updated Upstream (Paper) PurpurMC/Purpur@e2e8c61: Updated Upstream (Paper) PurpurMC/Purpur@7a01fd8: Updated Upstream (Paper) PurpurMC/Purpur@34c18f0: Updated Upstream (Paper) PurpurMC/Purpur@ca668ab: Updated Upstream (Paper) PurpurMC/Purpur@200178d: Updated Upstream (Paper) PurpurMC/Purpur@9968cbb: Updated Upstream (Paper) PurpurMC/Purpur@db09358: Fix clamp-levels option not being true by default (#1609) PurpurMC/Purpur@f289b6a: Updated Upstream (Paper) PurpurMC/Purpur@959c29d: Fix Tridents giving errors without having an Elytra equipped (#1612) PurpurMC/Purpur@68c1612: Fix villagers not spawning when the `follow-emerald-blocks` option is enabled (#1611) PurpurMC/Purpur@5b75c68: fix `bypass-mob-griefing` not being the inverse of mobgriefing gamerule, closes #1603 PurpurMC/Purpur@55d4309: Updated Upstream (Paper) PurpurMC/Purpur@0601f87: Updated Upstream (Paper) PurpurMC/Purpur@06dde9d: Add Ridable and Attribute options for Creaking mob (#1613) PurpurMC/Purpur@420a1ce: Set the bee's `takes-damage-from-water` option to true by default (#1614) PurpurMC/Purpur@2b6f273: Updated Upstream (Paper) PurpurMC/Purpur@504f311: Updated Upstream (Paper) PurpurMC/Purpur@2b694c9: Updated Upstream (Paper) PurpurMC/Purpur@96d7ef7: Updated Upstream (Paper) PurpurMC/Purpur@e141f68: Updated Upstream (Paper) PurpurMC/Purpur@7f6f667: Updated Upstream (Pufferfish) PurpurMC/Purpur@de20ba9: ignore `minecart.max-speed` config value if using minecart experiment, closes #1618 PurpurMC/Purpur@03062a8: fix ridable mobs not being controllable, closes #1620 PurpurMC/Purpur@0493ac3: Updated Upstream (Paper) PurpurMC/Purpur@16ce24a: fix(ridables/creaking): override tick method in look/move control
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..f8cdd6911fe9d6402455b7368d0e98c25e9511ca 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 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),
|