GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fix some problems brought from merge conflicts

Browse source
This commit is contained in:
RednedEpic 2020-03-05 20:53:58 -06:00
parent 418026dbe6
commit b2d611e24c
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/pullrequest.yml vendored
View file

@ -19,6 +19,8 @@ jobs:
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 1.8 java-version: 1.8
- name: submodules-init
uses: snickerbockers/submodules-init@v4
- name: Build with Maven - name: Build with Maven
run: mvn -B package run: mvn -B package
- name: Archive artifacts - name: Archive artifacts

6
connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file

@ -165,9 +165,9 @@ public class GeyserSession implements CommandSender {
ChunkUtils.sendEmptyChunks(this, playerEntity.getPosition().toInt(), 0, false); ChunkUtils.sendEmptyChunks(this, playerEntity.getPosition().toInt(), 0, false);
BiomeDefinitionListPacket biomePacket = new BiomeDefinitionListPacket(); BiomeDefinitionListPacket biomeDefinitionListPacket = new BiomeDefinitionListPacket();
biomePacket.setTag(CompoundTag.EMPTY); biomeDefinitionListPacket.setTag(Toolbox.BIOMES);
upstream.sendPacket(biomePacket); upstream.sendPacket(biomeDefinitionListPacket);
AvailableEntityIdentifiersPacket entityPacket = new AvailableEntityIdentifiersPacket(); AvailableEntityIdentifiersPacket entityPacket = new AvailableEntityIdentifiersPacket();
entityPacket.setTag(CompoundTag.EMPTY); entityPacket.setTag(CompoundTag.EMPTY);

8
connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
View file

@ -157,14 +157,14 @@ public class MessageUtils {
base += "r"; base += "r";
break; break;
default: default:
return ""; break;
} }
return base; return base;
} }
private static String getFormat(List<ChatFormat> formats) { private static String getFormat(List<ChatFormat> formats) {
String str = ""; StringBuilder str = new StringBuilder();
for (ChatFormat cf : formats) { for (ChatFormat cf : formats) {
String base = "\u00a7"; String base = "\u00a7";
switch (cf) { switch (cf) {
@ -187,10 +187,10 @@ public class MessageUtils {
break; break;
} }
str += base; str.append(base);
} }
return str; return str.toString();
} }
public static boolean isMessage(String text) { public static boolean isMessage(String text) {