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

[ci skip] Fixed if spacing (#1941)

Browse source 
Co-authored-by: yehudahrrs <47502993+yehudahrrs@users.noreply.github.com>
This commit is contained in:
YHDiamond 2021-02-16 20:09:18 -05:00 committed by GitHub
parent e0bd5a62a7
commit 62cbdb8f5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrap/sponge/src/main/java/org/geysermc/platform/sponge/GeyserSpongePlugin.java
View file

@ -101,7 +101,7 @@ public class GeyserSpongePlugin implements GeyserBootstrap {
} }
} }
if (geyserConfig.getBedrock().isCloneRemotePort()){ if (geyserConfig.getBedrock().isCloneRemotePort()) {
geyserConfig.getBedrock().setPort(geyserConfig.getRemote().getPort()); geyserConfig.getBedrock().setPort(geyserConfig.getRemote().getPort());
} }

2
connector/src/main/java/org/geysermc/connector/entity/living/animal/RabbitEntity.java
View file

@ -44,7 +44,7 @@ public class RabbitEntity extends AnimalEntity {
if (entityMetadata.getId() == 15) { if (entityMetadata.getId() == 15) {
metadata.put(EntityData.SCALE, .55f); metadata.put(EntityData.SCALE, .55f);
boolean isBaby = (boolean) entityMetadata.getValue(); boolean isBaby = (boolean) entityMetadata.getValue();
if(isBaby) { if (isBaby) {
metadata.put(EntityData.SCALE, .35f); metadata.put(EntityData.SCALE, .35f);
metadata.getFlags().setFlag(EntityFlag.BABY, true); metadata.getFlags().setFlag(EntityFlag.BABY, true);
} }

2
connector/src/main/java/org/geysermc/connector/entity/living/merchant/VillagerEntity.java
View file

@ -125,7 +125,7 @@ public class VillagerEntity extends AbstractMerchantEntity {
Pattern r = Pattern.compile("facing=([a-z]+)"); Pattern r = Pattern.compile("facing=([a-z]+)");
Matcher m = r.matcher(bedRotationZ); Matcher m = r.matcher(bedRotationZ);
if (m.find()) { if (m.find()) {
switch (m.group(0)){ switch (m.group(0)) {
case "facing=south": case "facing=south":
//bed is facing south //bed is facing south
z = 180; z = 180;

4
connector/src/main/java/org/geysermc/connector/network/QueryPacketHandler.java
View file

@ -64,7 +64,7 @@ public class QueryPacketHandler {
* @param buffer The Query data * @param buffer The Query data
*/ */
public QueryPacketHandler(GeyserConnector connector, InetSocketAddress sender, ByteBuf buffer) { public QueryPacketHandler(GeyserConnector connector, InetSocketAddress sender, ByteBuf buffer) {
if(!isQueryPacket(buffer)) if (!isQueryPacket(buffer))
return; return;
this.connector = connector; this.connector = connector;
@ -225,7 +225,7 @@ public class QueryPacketHandler {
query.write(new byte[] { 0x00, 0x00 }); query.write(new byte[] { 0x00, 0x00 });
// Fill player names // Fill player names
if(pingInfo != null) { if (pingInfo != null) {
for (String username : pingInfo.getPlayerList()) { for (String username : pingInfo.getPlayerList()) {
query.write(username.getBytes()); query.write(username.getBytes());
query.write((byte) 0x00); query.write((byte) 0x00);

2
connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaPlaySoundTranslator.java
View file

@ -52,7 +52,7 @@ public class JavaPlaySoundTranslator extends PacketTranslator<ServerPlaySoundPac
SoundRegistry.SoundMapping soundMapping = SoundRegistry.fromJava(packetSound.replace("minecraft:", "")); SoundRegistry.SoundMapping soundMapping = SoundRegistry.fromJava(packetSound.replace("minecraft:", ""));
String playsound; String playsound;
if(soundMapping == null || soundMapping.getPlaysound() == null) { if (soundMapping == null || soundMapping.getPlaysound() == null) {
// no mapping // no mapping
session.getConnector().getLogger() session.getConnector().getLogger()
.debug("[PlaySound] Defaulting to sound server gave us for " + packet.toString()); .debug("[PlaySound] Defaulting to sound server gave us for " + packet.toString());