mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Fix some problems brought from merge conflicts
This commit is contained in:
parent
418026dbe6
commit
b2d611e24c
3 changed files with 9 additions and 7 deletions
2
.github/workflows/pullrequest.yml
vendored
2
.github/workflows/pullrequest.yml
vendored
|
@ -19,6 +19,8 @@ jobs:
|
|||
uses: actions/setup-java@v1
|
||||
with:
|
||||
java-version: 1.8
|
||||
- name: submodules-init
|
||||
uses: snickerbockers/submodules-init@v4
|
||||
- name: Build with Maven
|
||||
run: mvn -B package
|
||||
- name: Archive artifacts
|
||||
|
|
|
@ -165,9 +165,9 @@ public class GeyserSession implements CommandSender {
|
|||
|
||||
ChunkUtils.sendEmptyChunks(this, playerEntity.getPosition().toInt(), 0, false);
|
||||
|
||||
BiomeDefinitionListPacket biomePacket = new BiomeDefinitionListPacket();
|
||||
biomePacket.setTag(CompoundTag.EMPTY);
|
||||
upstream.sendPacket(biomePacket);
|
||||
BiomeDefinitionListPacket biomeDefinitionListPacket = new BiomeDefinitionListPacket();
|
||||
biomeDefinitionListPacket.setTag(Toolbox.BIOMES);
|
||||
upstream.sendPacket(biomeDefinitionListPacket);
|
||||
|
||||
AvailableEntityIdentifiersPacket entityPacket = new AvailableEntityIdentifiersPacket();
|
||||
entityPacket.setTag(CompoundTag.EMPTY);
|
||||
|
|
|
@ -157,14 +157,14 @@ public class MessageUtils {
|
|||
base += "r";
|
||||
break;
|
||||
default:
|
||||
return "";
|
||||
break;
|
||||
}
|
||||
|
||||
return base;
|
||||
}
|
||||
|
||||
private static String getFormat(List<ChatFormat> formats) {
|
||||
String str = "";
|
||||
StringBuilder str = new StringBuilder();
|
||||
for (ChatFormat cf : formats) {
|
||||
String base = "\u00a7";
|
||||
switch (cf) {
|
||||
|
@ -187,10 +187,10 @@ public class MessageUtils {
|
|||
break;
|
||||
}
|
||||
|
||||
str += base;
|
||||
str.append(base);
|
||||
}
|
||||
|
||||
return str;
|
||||
return str.toString();
|
||||
}
|
||||
|
||||
public static boolean isMessage(String text) {
|
||||
|
|
Loading…
Reference in a new issue