From c5aab0ea00fb862f1ef4c67028ef783662d52260 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Thu, 9 Jun 2022 22:27:24 +0200
Subject: [PATCH] Default to passive networking

---
 .../com/minelittlepony/api/pony/network/fabric/Channel.java  | 3 +--
 src/main/java/com/minelittlepony/client/HorseCam.java        | 1 -
 src/main/java/com/minelittlepony/settings/PonyConfig.java    | 5 -----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/com/minelittlepony/api/pony/network/fabric/Channel.java b/src/main/java/com/minelittlepony/api/pony/network/fabric/Channel.java
index 44c27dc5..6477bb07 100644
--- a/src/main/java/com/minelittlepony/api/pony/network/fabric/Channel.java
+++ b/src/main/java/com/minelittlepony/api/pony/network/fabric/Channel.java
@@ -55,8 +55,7 @@ public class Channel {
             throw new RuntimeException("Client packet send called by the server");
         }
 
-        if (MineLittlePony.getInstance().getConfig().passiveNetworking.get()
-                && !registered) {
+        if (!registered) {
             if (MinecraftClient.getInstance().isInSingleplayer() || MinecraftClient.getInstance().isIntegratedServerRunning()) {
                 MineLittlePony.logger.info("Sending pony skin data over as we are either in single-player or lan");
             } else {
diff --git a/src/main/java/com/minelittlepony/client/HorseCam.java b/src/main/java/com/minelittlepony/client/HorseCam.java
index d3f482e2..591f0217 100644
--- a/src/main/java/com/minelittlepony/client/HorseCam.java
+++ b/src/main/java/com/minelittlepony/client/HorseCam.java
@@ -1,6 +1,5 @@
 package com.minelittlepony.client;
 
-import net.minecraft.block.Blocks;
 import net.minecraft.block.Material;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/com/minelittlepony/settings/PonyConfig.java b/src/main/java/com/minelittlepony/settings/PonyConfig.java
index 68d64c67..9d3882d9 100644
--- a/src/main/java/com/minelittlepony/settings/PonyConfig.java
+++ b/src/main/java/com/minelittlepony/settings/PonyConfig.java
@@ -27,11 +27,6 @@ public class PonyConfig extends JsonConfig {
     public final Setting<Boolean> ponyskulls = value("settings", "ponyskulls", true);
     public final Setting<Boolean> frustrum =   value("settings", "frustrum", true);
 
-    /**
-     * Temporary flag to enable post-1.18 networking behaviour.
-     */
-    public final Setting<Boolean> passiveNetworking = value("settings", "passiveNetworking", false);
-
     /**
      * Debug override for pony sizes.
      */