mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-27 15:09:34 +02:00
* Allow entity effect modification off the main thread for worldgen * squash all async catcher patches
20 lines
1.5 KiB
Diff
20 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Fri, 9 Dec 2022 12:11:39 -0800
|
|
Subject: [PATCH] Fix MapLike Codec missing key 'selector'
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/gameevent/vibrations/VibrationListener.java b/src/main/java/net/minecraft/world/level/gameevent/vibrations/VibrationListener.java
|
|
index 586d0a40cc4f36e80236e87232bb58f81ec089a5..103e12ec589dcbe6dbad7432b50e0644c3a37b1b 100644
|
|
--- a/src/main/java/net/minecraft/world/level/gameevent/vibrations/VibrationListener.java
|
|
+++ b/src/main/java/net/minecraft/world/level/gameevent/vibrations/VibrationListener.java
|
|
@@ -99,7 +99,7 @@ public class VibrationListener implements GameEventListener {
|
|
return vibrationlistener.listenerRange;
|
|
}), VibrationInfo.CODEC.optionalFieldOf("event").forGetter((vibrationlistener) -> {
|
|
return Optional.ofNullable(vibrationlistener.currentVibration);
|
|
- }), VibrationSelector.CODEC.fieldOf("selector").forGetter((vibrationlistener) -> {
|
|
+ }), Codec.optionalField("selector", VibrationSelector.CODEC).xmap(o -> o.orElseGet(VibrationSelector::new), Optional::of).forGetter((vibrationlistener) -> { // Paper - fix MapLike spam for missing "selector" in 1.19.2
|
|
return vibrationlistener.selectionStrategy;
|
|
}), ExtraCodecs.NON_NEGATIVE_INT.fieldOf("event_delay").orElse(0).forGetter((vibrationlistener) -> {
|
|
return vibrationlistener.travelTimeInTicks;
|