mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-20 19:33:32 +02:00
Merge in some stuff
This commit is contained in:
parent
20b8330a25
commit
7899e58d02
2
Bukkit
2
Bukkit
|
@ -1 +1 @@
|
|||
Subproject commit bd80c6eb2d0ad2f68e74097b70c8e6a362517253
|
||||
Subproject commit ad1f1c2c75f4e5e7ffded02ab4a3c117a8f6f957
|
|
@ -1 +1 @@
|
|||
Subproject commit 4857595e0afadd112f8ba147d88052b23b252797
|
||||
Subproject commit 5a2dda293f5b025a0165a67f58b92cba11b4b904
|
|
@ -1,4 +1,4 @@
|
|||
From 43a4368814bb1162e0cc30b58ba911b3d6099646 Mon Sep 17 00:00:00 2001
|
||||
From 95f2e5161b4c710aa311b89876e3d5d341768f26 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 2 Jun 2013 15:10:56 +1000
|
||||
Subject: [PATCH] Skeleton API Implementations
|
||||
|
@ -64,10 +64,10 @@ index fe0f200..e026c1f 100644
|
|||
+ // Spigot end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 0153608..9add7bf 100644
|
||||
index 48c5ae9..9f09b84 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1125,4 +1125,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1126,4 +1126,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
}
|
||||
collection.add(new AttributeModifiable(getHandle().bc(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 80b6402b3418bbaa834f68b7fc852bd3d81908a0 Mon Sep 17 00:00:00 2001
|
||||
From afcc9e6c55d58da7b8234625b6257c8edcf78bc6 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 3 Feb 2013 12:28:17 +1100
|
||||
Subject: [PATCH] Highly Optimized Tick Loop
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index c1c4aa0..5db21fd 100644
|
||||
index c78e47b..ce2aaf4 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -101,6 +101,12 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
|
@ -21,7 +21,7 @@ index c1c4aa0..5db21fd 100644
|
|||
|
||||
public MinecraftServer(OptionSet options, Proxy proxy) { // CraftBukkit - signature file -> OptionSet
|
||||
i = this;
|
||||
@@ -418,45 +424,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
@@ -422,45 +428,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
public void run() {
|
||||
try {
|
||||
if (this.init()) {
|
||||
|
@ -123,7 +123,7 @@ index 0000000..f114a31
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
index 2f2752a..b5d611b 100644
|
||||
index 3dfe4ed..1b0e1bf 100644
|
||||
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
@@ -14,6 +14,7 @@ import net.minecraft.server.MinecraftServer;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 71424df72027daf0b96555a580d54fc91909b8b5 Mon Sep 17 00:00:00 2001
|
||||
From d8e3dd9843d4506465935ccfb39c6c1e9188f600 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 10 Jan 2013 00:18:11 -0500
|
||||
Subject: [PATCH] Improved Timings System
|
||||
|
@ -64,7 +64,7 @@ index fec07f8..0c1350e 100644
|
|||
|
||||
protected String H() {
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 5db21fd..9543509 100644
|
||||
index ce2aaf4..453e508 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -10,7 +10,6 @@ import java.util.ArrayList;
|
||||
|
@ -83,7 +83,7 @@ index 5db21fd..9543509 100644
|
|||
import org.bukkit.craftbukkit.util.Waitable;
|
||||
import org.bukkit.event.server.RemoteServerCommandEvent;
|
||||
import org.bukkit.event.world.WorldSaveEvent;
|
||||
@@ -438,7 +438,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
@@ -442,7 +442,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
currentTPS = (currentTPS * 0.95) + (1E9 / (curTime - lastTick) * 0.05);
|
||||
lastTick = curTime;
|
||||
MinecraftServer.currentTick++;
|
||||
|
@ -94,7 +94,7 @@ index 5db21fd..9543509 100644
|
|||
}
|
||||
// Spigot end
|
||||
} else {
|
||||
@@ -563,6 +566,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
@@ -567,6 +570,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
public void u() {
|
||||
this.methodProfiler.a("levels");
|
||||
|
||||
|
@ -102,7 +102,7 @@ index 5db21fd..9543509 100644
|
|||
// CraftBukkit start
|
||||
this.server.getScheduler().mainThreadHeartbeat(this.ticks);
|
||||
|
||||
@@ -571,7 +575,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
@@ -575,7 +579,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
processQueue.remove().run();
|
||||
}
|
||||
|
||||
|
@ -113,7 +113,7 @@ index 5db21fd..9543509 100644
|
|||
|
||||
// Send time updates to everyone, it will get the right time from the world the player is in.
|
||||
if (this.ticks % 20 == 0) {
|
||||
@@ -623,7 +630,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
@@ -627,7 +634,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
|
||||
this.methodProfiler.b();
|
||||
this.methodProfiler.a("tracker");
|
||||
|
@ -123,7 +123,7 @@ index 5db21fd..9543509 100644
|
|||
this.methodProfiler.b();
|
||||
this.methodProfiler.b();
|
||||
// } // CraftBukkit
|
||||
@@ -632,14 +641,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
@@ -636,14 +645,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
}
|
||||
|
||||
this.methodProfiler.c("connection");
|
||||
|
@ -145,10 +145,10 @@ index 5db21fd..9543509 100644
|
|||
this.methodProfiler.b();
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index da1a7e7..c4ed619 100644
|
||||
index d32bf3f..d34fea7 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -915,6 +915,7 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
@@ -914,6 +914,7 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
// CraftBukkit end
|
||||
|
||||
private void handleCommand(String s) {
|
||||
|
@ -156,7 +156,7 @@ index da1a7e7..c4ed619 100644
|
|||
// CraftBukkit start
|
||||
CraftPlayer player = this.getPlayer();
|
||||
|
||||
@@ -922,19 +923,23 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
@@ -921,19 +922,23 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
this.server.getPluginManager().callEvent(event);
|
||||
|
||||
if (event.isCancelled()) {
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From daed468c7916d5bf90cc56e5c16558ec5492db97 Mon Sep 17 00:00:00 2001
|
||||
From 798537c091b6cf69a3d872445d1ec08327214179 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Mon, 4 Mar 2013 18:45:52 +1100
|
||||
Subject: [PATCH] PlayerItemDamageEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
index 53c665b..123e4a5 100644
|
||||
index b308e03..f32322e 100644
|
||||
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||||
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||||
@@ -175,7 +175,13 @@ public final class ItemStack {
|
||||
@@ -176,7 +176,13 @@ public final class ItemStack {
|
||||
return this.item.getMaxDurability();
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,7 @@ index 53c665b..123e4a5 100644
|
|||
if (!this.g()) {
|
||||
return false;
|
||||
} else {
|
||||
@@ -190,7 +196,16 @@ public final class ItemStack {
|
||||
@@ -191,7 +197,16 @@ public final class ItemStack {
|
||||
}
|
||||
|
||||
i -= k;
|
||||
|
@ -40,7 +40,7 @@ index 53c665b..123e4a5 100644
|
|||
return false;
|
||||
}
|
||||
}
|
||||
@@ -203,7 +218,7 @@ public final class ItemStack {
|
||||
@@ -204,7 +219,7 @@ public final class ItemStack {
|
||||
public void damage(int i, EntityLiving entityliving) {
|
||||
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
|
||||
if (this.g()) {
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From d7a201d255ff143edf20b3ae9d1f901fadd79b71 Mon Sep 17 00:00:00 2001
|
||||
From 89d72a512578e8c152d804e8b39c55436ea48d57 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Fri, 21 Jun 2013 18:01:29 +1000
|
||||
Subject: [PATCH] Allow Disabling of Command Logging
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index c4ed619..67c8bba 100644
|
||||
index d34fea7..df988f1 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -928,7 +928,12 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
@@ -927,7 +927,12 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
}
|
||||
|
||||
try {
|
||||
|
@ -23,7 +23,7 @@ index c4ed619..67c8bba 100644
|
|||
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
|
||||
return;
|
||||
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
index 31e708c..895af4b 100644
|
||||
index 0043690..26d5845 100644
|
||||
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
@@ -136,4 +136,10 @@ public class SpigotConfig
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 7a04ca8d3b12f0368dcf7c01b6e6fe51882f7126 Mon Sep 17 00:00:00 2001
|
||||
From 5d046da9dcfbe18c17127c4b32b1f27c1ba6c536 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Fri, 28 Jun 2013 19:52:54 +1000
|
||||
Subject: [PATCH] Disallow Interaction With Self
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 67c8bba..c38d48a 100644
|
||||
index df988f1..21462c5 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1035,6 +1035,13 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
@@ -1044,6 +1044,13 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
if (this.player.dead) return; // CraftBukkit
|
||||
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
|
||||
Entity entity = packetplayinuseentity.a((World) worldserver);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From e06caf926bf30ae3585bef652cbd000bf44a6ebd Mon Sep 17 00:00:00 2001
|
||||
From 9997f20f4bbd26fc878222eaf6f9060c18c12920 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 3 Aug 2013 19:27:07 +1000
|
||||
Subject: [PATCH] Player Collision API
|
||||
|
@ -18,10 +18,10 @@ index 7442943..f034d30 100644
|
|||
Entity entity = (Entity) list.get(i);
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index a61001d..24a59eb 100644
|
||||
index d06ec7b..35b2f75 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -1478,7 +1478,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1485,7 +1485,7 @@ public abstract class EntityLiving extends Entity {
|
||||
protected void bo() {
|
||||
List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
|
||||
|
||||
|
@ -57,10 +57,10 @@ index af08d2f..d910e8a 100644
|
|||
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
|
||||
super(worldserver, gameprofile);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 0b8b324..67e7747 100644
|
||||
index cec99a1..2492000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1130,6 +1130,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1131,6 +1131,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
// Spigot start
|
||||
private final Player.Spigot spigot = new Player.Spigot()
|
||||
{
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 6eeca020dbe3c480f2c40d78570122ee202d8286 Mon Sep 17 00:00:00 2001
|
||||
From fff6a6489c3af67f69c2eee46967df7fb809d3c1 Mon Sep 17 00:00:00 2001
|
||||
From: agentk20 <agentkid20@gmail.com>
|
||||
Date: Sat, 3 Aug 2013 19:28:48 +1000
|
||||
Subject: [PATCH] Fully Disable Snooper When Not Required
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 9543509..6b5e092 100644
|
||||
index 453e508..76bbf83 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -551,11 +551,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
@@ -555,11 +555,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
this.f[this.ticks % 100] = System.nanoTime() - i;
|
||||
this.methodProfiler.b();
|
||||
this.methodProfiler.a("snooper");
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 86b48c644905556f2b90a2513dd7abc3f15176a7 Mon Sep 17 00:00:00 2001
|
||||
From 9584169bdf6aa8b3c0d06f042d5306ca49a31a21 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Mon, 5 Aug 2013 20:17:20 +1000
|
||||
Subject: [PATCH] Cap Minimum Player Speed
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 67e7747..07f7c2e 100644
|
||||
index 2492000..627a580 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1002,7 +1002,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1003,7 +1003,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public void setFlySpeed(float value) {
|
||||
validateSpeed(value);
|
||||
EntityPlayer player = getHandle();
|
||||
|
@ -17,7 +17,7 @@ index 67e7747..07f7c2e 100644
|
|||
player.updateAbilities();
|
||||
|
||||
}
|
||||
@@ -1010,7 +1010,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1011,7 +1011,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public void setWalkSpeed(float value) {
|
||||
validateSpeed(value);
|
||||
EntityPlayer player = getHandle();
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From e5341b42a62c7f139ac3eedbb0c50c0bbfec5cfc Mon Sep 17 00:00:00 2001
|
||||
From 443c2d3ba804b76d3c18dd0bcac4011e14f755b3 Mon Sep 17 00:00:00 2001
|
||||
From: ninja- <xninja@openmailbox.org>
|
||||
Date: Tue, 8 Oct 2013 14:34:49 +0200
|
||||
Subject: [PATCH] Implement respawn API.
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 07f7c2e..f870cc6 100644
|
||||
index 627a580..9569bd4 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1143,6 +1143,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1144,6 +1144,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
getHandle().collidesWithEntities = collides;
|
||||
getHandle().l = collides; // First boolean of Entity
|
||||
}
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From a34414532e3cea8d346427482b49fea87d2744ac Mon Sep 17 00:00:00 2001
|
||||
From f8af28a8dd18b38f17b93bc2d40262d0856333f8 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 23 Feb 2013 12:33:20 +1100
|
||||
Subject: [PATCH] Watchdog Thread.
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 6b5e092..170cdef 100644
|
||||
index 76bbf83..59c76d8 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -442,6 +442,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
@@ -446,6 +446,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
this.t();
|
||||
SpigotTimings.serverTickTimer.stopTiming();
|
||||
org.spigotmc.CustomTimingsHandler.tick();
|
||||
|
@ -16,7 +16,7 @@ index 6b5e092..170cdef 100644
|
|||
}
|
||||
// Spigot end
|
||||
} else {
|
||||
@@ -468,6 +469,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
@@ -472,6 +473,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
||||
this.a(crashreport);
|
||||
} finally {
|
||||
try {
|
||||
|
@ -144,7 +144,7 @@ index 0000000..a8840c9
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
index 7c07142..801b071 100644
|
||||
index 6d0a08e..6e32691 100644
|
||||
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
||||
@@ -173,4 +173,18 @@ public class SpigotConfig
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 51de2389798d132adf7dee48679106e330af84bc Mon Sep 17 00:00:00 2001
|
||||
From 1ba7c07ce2746c0bbf748599aed3b6800a50d561 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 8 Dec 2013 16:52:42 +1100
|
||||
Subject: [PATCH] Remove OS X Special Chars from Signs
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index ff91fd3..2f45a3e 100644
|
||||
index 97f0abd..d7dbc54 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1550,6 +1550,7 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
@@ -1559,6 +1559,7 @@ public class PlayerConnection implements PacketPlayInListener {
|
||||
|
||||
for (j = 0; j < 4; ++j) {
|
||||
boolean flag = true;
|
||||
|
|
Loading…
Reference in New Issue
Block a user