--- ../src-base/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
+++ ../src-work/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
@@ -84,7 +84,7 @@
         boolean flag2 = this.field_148301_e.field_82821_f < 47;
         boolean flag3 = flag1 || flag2;
         this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_180790_2_ + 32 + 3, p_180790_3_ + 1, 16777215);
-        List list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_180790_4_ - 32 - 2);
+        List list = this.field_148300_d.field_71466_p.func_78271_c(net.minecraftforge.fml.client.FMLClientHandler.instance().fixDescription(this.field_148301_e.field_78843_d), p_180790_4_ - 48 - 2);
 
         for (int l1 = 0; l1 < Math.min(list.size(), 2); ++l1)
         {
@@ -178,6 +178,11 @@
         int k2 = p_180790_6_ - p_180790_2_;
         int l2 = p_180790_7_ - p_180790_3_;
 
+        String tooltip = net.minecraftforge.fml.client.FMLClientHandler.instance().enhanceServerListEntry(this, this.field_148301_e, p_180790_2_, p_180790_4_, p_180790_3_, k2, l2);
+        if (tooltip != null)
+        {
+            this.field_148303_c.func_146793_a(tooltip);
+        } else
         if (k2 >= p_180790_4_ - 15 && k2 <= p_180790_4_ - 5 && l2 >= 0 && l2 <= 8)
         {
             this.field_148303_c.func_146793_a(s1);
