GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-28 11:09:13 +00:00
Code Issues Releases Activity

Made Floodgate-Fabric build again

Browse Source
This commit is contained in:
Tim203
2021-07-05 16:21:01 +02:00
parent a0ceafe1d1
commit c9fd77fa44
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/geysermc/floodgate/addon/data/FabricDataAddon.java
View File

@@ -34,11 +34,6 @@ public final class FabricDataAddon implements InjectorAddon {
);
}
@Override
public void onLoginDone(Channel channel) {
onRemoveInject(channel);
}
@Override
public void onChannelClosed(Channel channel) {
FloodgatePlayer player = channel.attr(playerAttribute).get();

10
src/main/java/org/geysermc/floodgate/pluginmessage/FabricSkinApplier.java
View File

@@ -1,7 +1,6 @@
package org.geysermc.floodgate.pluginmessage;
import com.google.common.collect.Lists;
import com.google.gson.JsonObject;
import com.mojang.authlib.properties.Property;
import com.mojang.authlib.properties.PropertyMap;
import com.mojang.datafixers.util.Pair;
@@ -16,6 +15,7 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity;
import org.geysermc.floodgate.api.player.FloodgatePlayer;
import org.geysermc.floodgate.skin.SkinApplier;
import org.geysermc.floodgate.skin.SkinData;
import java.util.Collection;
import java.util.List;
@@ -26,7 +26,7 @@ public final class FabricSkinApplier implements SkinApplier {
private static MinecraftServer SERVER;
@Override
public void applySkin(FloodgatePlayer floodgatePlayer, JsonObject skinResult) {
public void applySkin(FloodgatePlayer floodgatePlayer, SkinData skinData) {
SERVER.execute(() -> {
ServerPlayerEntity bedrockPlayer = SERVER.getPlayerManager().getPlayer(floodgatePlayer.getCorrectUniqueId());
if (bedrockPlayer == null) {
@@ -38,11 +38,7 @@ public final class FabricSkinApplier implements SkinApplier {
PropertyMap properties = bedrockPlayer.getGameProfile().getProperties();
properties.removeAll("textures");
Property property = new Property(
"textures",
skinResult.get("value").getAsString(),
skinResult.get("signature").getAsString());
properties.put("textures", property);
properties.put("textures", new Property("textures", skinData.getValue(), skinData.getSignature()));
// Skin is applied - now it's time to refresh the player for everyone. Oof.
for (ServerPlayerEntity otherPlayer : SERVER.getPlayerManager().getPlayerList()) {