Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into fix/heightmaps

This commit is contained in:
Lukas Rieger (Blue) 2023-11-18 13:50:42 +01:00
parent 9e599f611e c69b31ce84
commit b736085b51
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resources/BlockPropertiesConfig.java
View File

@ -75,7 +75,7 @@ public class BlockPropertiesConfig {
BlockStateMapping<BlockProperties> mapping = new BlockStateMapping<>(bsKey, bsValueBuilder.build());
// don't overwrite already present values, higher priority resources are loaded first
mappings.computeIfAbsent(bsKey.getFormatted(), k -> new LinkedList<>()).add(0, mapping);
mappings.computeIfAbsent(bsKey.getFormatted(), k -> new LinkedList<>()).add(mapping);
}
json.endObject();
}

2
implementations/paper/src/main/java/de/bluecolored/bluemap/bukkit/EventForwarder.java
View File

@ -65,7 +65,7 @@ public class EventForwarder implements Listener {
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public synchronized void onPlayerChat(AsyncChatEvent evt) {
String message = String.format(PlainTextComponentSerializer.plainText().serialize(evt.message()));
String message = PlainTextComponentSerializer.plainText().serialize(evt.message());
for (ServerEventListener listener : listeners) listener.onChatMessage(Text.of(message));
}