SPIGOT-1050: Add a missing case in the disable usercache saving option
This commit is contained in:
parent
633137c1a8
commit
060c59ea95
35 changed files with 142 additions and 133 deletions
|
@ -1,4 +1,4 @@
|
|||
From 85eb074cb01b2de14b203a5f15fba5ea6d71d2e3 Mon Sep 17 00:00:00 2001
|
||||
From 8cbecffde39ed8b6dd830dc48553a3f7f825aeeb 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
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations
|
|||
This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 8849087..0b0074d 100644
|
||||
index f5722c6..5bc3875 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1638,4 +1638,14 @@ public final class CraftServer implements Server {
|
||||
@@ -1636,4 +1636,14 @@ public final class CraftServer implements Server {
|
||||
public UnsafeValues getUnsafe() {
|
||||
return CraftMagicNumbers.INSTANCE;
|
||||
}
|
||||
|
@ -64,10 +64,10 @@ index dca8520..bf48e6e 100644
|
|||
+ // Spigot end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
index 705381f..7a9b11c 100644
|
||||
index 8f5c058..93193ac 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -535,4 +535,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
@@ -537,4 +537,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
public void setOp(boolean value) {
|
||||
perm.setOp(value);
|
||||
}
|
||||
|
@ -104,10 +104,10 @@ index 64e346d..243e8e5 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 abc135e..074df2b 100644
|
||||
index 40f52f1..e823f72 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1346,4 +1346,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1340,4 +1340,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
PacketPlayOutTitle packetReset = new PacketPlayOutTitle(EnumTitleAction.RESET, null);
|
||||
getHandle().playerConnection.sendPacket(packetReset);
|
||||
}
|
||||
|
@ -124,10 +124,10 @@ index abc135e..074df2b 100644
|
|||
+ // Spigot end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
index 5f123e3..f0a6002 100644
|
||||
index 7c3adbb..e487d52 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
@@ -818,4 +818,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
||||
@@ -819,4 +819,16 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
||||
return HANDLED_TAGS;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From b4176ca0fac21a90b171b449f00d24ba8f619c24 Mon Sep 17 00:00:00 2001
|
||||
From e9ca76fd7f1f247f6219b8ded77f9532ff5ae785 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 7 Jul 2013 09:32:53 +1000
|
||||
Subject: [PATCH] Spigot Configuration
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Configuration
|
|||
Provides the basic infrastructure to load and save the Spigot configuration file, spigot.yml
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index 1094be8..24ecbd2 100644
|
||||
index 05ea307..7e93c95 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -162,6 +162,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
|
@ -35,7 +35,7 @@ index 1094be8..24ecbd2 100644
|
|||
if (!this.getOnlineMode()) {
|
||||
DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index d83842a..0356d9e 100644
|
||||
index f7c913d..1638081 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -102,6 +102,7 @@ public abstract class World implements IBlockAccess {
|
||||
|
@ -55,7 +55,7 @@ index d83842a..0356d9e 100644
|
|||
this.world = new CraftWorld((WorldServer) this, gen, env);
|
||||
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 0b0074d..37c403d 100644
|
||||
index 5bc3875..60cc7e8 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -247,8 +247,10 @@ public final class CraftServer implements Server {
|
||||
|
@ -71,7 +71,7 @@ index 0b0074d..37c403d 100644
|
|||
}
|
||||
|
||||
public boolean getCommandBlockOverride(String command) {
|
||||
@@ -671,6 +673,7 @@ public final class CraftServer implements Server {
|
||||
@@ -669,6 +671,7 @@ public final class CraftServer implements Server {
|
||||
logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
|
||||
}
|
||||
|
||||
|
@ -79,7 +79,7 @@ index 0b0074d..37c403d 100644
|
|||
for (WorldServer world : console.worlds) {
|
||||
world.worldData.setDifficulty(difficulty);
|
||||
world.setSpawnFlags(monsters, animals);
|
||||
@@ -685,11 +688,14 @@ public final class CraftServer implements Server {
|
||||
@@ -683,11 +686,14 @@ public final class CraftServer implements Server {
|
||||
} else {
|
||||
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 173502859d25e1820c875517ca7a435d1897e3dc Mon Sep 17 00:00:00 2001
|
||||
From 6cf841d064ceb73000411b4ff9832675da0fd2d6 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <git@md-5.net>
|
||||
Date: Tue, 25 Mar 2014 16:10:01 +1100
|
||||
Subject: [PATCH] Async Operation Catching
|
||||
|
@ -58,7 +58,7 @@ index 7a76dd0..e1ff4f0 100644
|
|||
EntityPlayer entityplayer = (EntityPlayer) entity;
|
||||
Iterator iterator = this.c.iterator();
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
||||
index 5ef2be4..8d50e05 100644
|
||||
index 89422ea..f0149bf 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
|
||||
@@ -310,6 +310,7 @@ public class EntityTrackerEntry {
|
||||
|
@ -134,10 +134,10 @@ index e3db8e1..07d1ee4 100644
|
|||
if (generate) {
|
||||
// Use the default variant of loadChunk when generate == true.
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 074df2b..a37085c 100644
|
||||
index e823f72..d4d6259 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -216,6 +216,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -210,6 +210,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
||||
@Override
|
||||
public void kickPlayer(String message) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 82977578e7ce6e67ae64b20888134749e0aead7c Mon Sep 17 00:00:00 2001
|
||||
From b3599f9bef1fe723ec620dcb375098821b2106f9 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 10 Jan 2013 00:18:11 -0500
|
||||
Subject: [PATCH] Spigot Timings
|
||||
|
@ -106,7 +106,7 @@ index cfd28f1..ad989e6 100644
|
|||
// return chunk; // CraftBukkit
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index 1e94b6d..d2d1818 100644
|
||||
index 7e93c95..38c634f 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -20,6 +20,7 @@ import java.io.PrintStream;
|
||||
|
@ -367,10 +367,10 @@ index 6199d30..a58ac4b 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 f0ac552..de5efbe 100644
|
||||
index 6329672..a7ca537 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1063,6 +1063,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -1077,6 +1077,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
// CraftBukkit end
|
||||
|
||||
private void handleCommand(String s) {
|
||||
|
@ -378,7 +378,7 @@ index f0ac552..de5efbe 100644
|
|||
// CraftBukkit start - whole method
|
||||
this.c.info(this.player.getName() + " issued server command: " + s);
|
||||
|
||||
@@ -1072,18 +1073,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -1086,18 +1087,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
this.server.getPluginManager().callEvent(event);
|
||||
|
||||
if (event.isCancelled()) {
|
||||
|
@ -583,10 +583,10 @@ index 9c0bcfe..8a1165c 100644
|
|||
|
||||
public BiomeBase.BiomeMeta a(EnumCreatureType enumcreaturetype, BlockPosition blockposition) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 37c403d..396c034 100644
|
||||
index 60cc7e8..6cb262e 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1648,6 +1648,11 @@ public final class CraftServer implements Server {
|
||||
@@ -1646,6 +1646,11 @@ public final class CraftServer implements Server {
|
||||
private final Spigot spigot = new Spigot()
|
||||
{
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 2e90980ec646629091be3c0caafc8ff8c5a37e69 Mon Sep 17 00:00:00 2001
|
||||
From de99b08eec3c384e0818447af13d91a1defb2004 Mon Sep 17 00:00:00 2001
|
||||
From: Antony Riley <antony@cyberiantiger.org>
|
||||
Date: Wed, 27 Mar 2013 01:41:54 +0200
|
||||
Subject: [PATCH] Close Unloaded Save Files
|
||||
|
@ -18,10 +18,10 @@ index b07e7d5..5528019 100644
|
|||
public static synchronized RegionFile a(File file, int i, int j) {
|
||||
File file1 = new File(file, "region");
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 396c034..8353b1d 100644
|
||||
index 6cb262e..25e9a70 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -963,6 +963,31 @@ public final class CraftServer implements Server {
|
||||
@@ -961,6 +961,31 @@ public final class CraftServer implements Server {
|
||||
|
||||
worlds.remove(world.getName().toLowerCase());
|
||||
console.worlds.remove(console.worlds.indexOf(handle));
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 56bf7e9fe6eebb3fc7eab2b589ca2bee149f8d26 Mon Sep 17 00:00:00 2001
|
||||
From 1b32b4afefa170a63a9d208a94ed43f6f3c6c0bb 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 794464a..40fa8b7 100644
|
||||
index a7ca537..1fca956 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1065,6 +1065,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -1079,6 +1079,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
private void handleCommand(String s) {
|
||||
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
|
||||
// CraftBukkit start - whole method
|
||||
|
@ -32,5 +32,5 @@ index dcca493..3999f5b 100644
|
|||
+ }
|
||||
}
|
||||
--
|
||||
1.9.0.msysgit.0
|
||||
2.1.4
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 302f7707caca0e35b27ffef542f2047295cb7657 Mon Sep 17 00:00:00 2001
|
||||
From cb4b2666c77a64d2d0d69fe7128cb5b79b1eebab Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Fri, 21 Jun 2013 18:05:54 +1000
|
||||
Subject: [PATCH] Allow Disabling of Command TabComplete
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 8353b1d..465623e 100644
|
||||
index 25e9a70..7ed538b 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1567,6 +1567,13 @@ public final class CraftServer implements Server {
|
||||
@@ -1565,6 +1565,13 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
public List<String> tabCompleteCommand(Player player, String message) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 5b465d6f2d3e0dc00095e4a862b2a7c35818ba67 Mon Sep 17 00:00:00 2001
|
||||
From d8d0242a43b027b308c0cc9ced929c804377f7dd Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Fri, 21 Jun 2013 19:21:58 +1000
|
||||
Subject: [PATCH] Configurable Messages
|
||||
|
@ -23,7 +23,7 @@ index 3b6a514..fcfdb65 100644
|
|||
this.b.close(chatcomponenttext);
|
||||
} else {
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 7918bcb..825823d 100644
|
||||
index 3838c75..49b908d 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -418,7 +418,7 @@ public abstract class PlayerList {
|
||||
|
@ -45,10 +45,10 @@ index 7918bcb..825823d 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 465623e..d07b3b8 100644
|
||||
index 7ed538b..75ea3a5 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -624,11 +624,7 @@ public final class CraftServer implements Server {
|
||||
@@ -622,11 +622,7 @@ public final class CraftServer implements Server {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From e0dd268fff6e3e43b0b43df156d5060c0f90d041 Mon Sep 17 00:00:00 2001
|
||||
From 666400319370efe36fb4f5fb4c67e745e264b044 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 40fa8b7..8cf0b71 100644
|
||||
index 1fca956..88f469d 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1200,6 +1200,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -1214,6 +1214,13 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
PlayerConnectionUtils.ensureMainThread(packetplayinuseentity, this, this.player.u());
|
||||
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
|
||||
Entity entity = packetplayinuseentity.a((World) worldserver);
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 4e7f9d600c61430373fbe1961fccef936c9575e4 Mon Sep 17 00:00:00 2001
|
||||
From dc094e0fa27086aada7a225a7209484ef7dd460a 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
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
index fe26522..d1e6e53 100644
|
||||
index cbb03bb..c93a5da 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -427,6 +427,7 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
|
@ -64,10 +64,10 @@ index e707dd7..b0681cf 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 a37085c..7e75708 100644
|
||||
index d4d6259..3a07a7b 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1351,6 +1351,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1345,6 +1345,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
// Spigot start
|
||||
private final Player.Spigot spigot = new Player.Spigot()
|
||||
{
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 45d9f27909e258188a9bf3e170e720c704783c96 Mon Sep 17 00:00:00 2001
|
||||
From c50de8cff776cd840dda89ad54781c745cdba93e Mon Sep 17 00:00:00 2001
|
||||
From: DerFlash <bte@freenet.de>
|
||||
Date: Sat, 3 Aug 2013 19:53:48 +1000
|
||||
Subject: [PATCH] Add Getter for Entity Invulnerability
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
index 7a9b11c..9df27e3 100644
|
||||
index 93193ac..89cbb45 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -539,6 +539,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
@@ -541,6 +541,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
// Spigot start
|
||||
private final Spigot spigot = new Spigot()
|
||||
{
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 4120f14faf9a7ce6a77474a51e1d6670b091a464 Mon Sep 17 00:00:00 2001
|
||||
From db11f2a5d6e0b42a20e651b4435e65cd918f330e 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 7e75708..b79a31c 100644
|
||||
index 3a07a7b..9d240c9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1184,7 +1184,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1178,7 +1178,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public void setFlySpeed(float value) {
|
||||
validateSpeed(value);
|
||||
EntityPlayer player = getHandle();
|
||||
|
@ -17,7 +17,7 @@ index 7e75708..b79a31c 100644
|
|||
player.updateAbilities();
|
||||
|
||||
}
|
||||
@@ -1193,7 +1193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1187,7 +1187,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public void setWalkSpeed(float value) {
|
||||
validateSpeed(value);
|
||||
EntityPlayer player = getHandle();
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 03820e05d3d87448b1242ed5ca4c68d9ffa01c74 Mon Sep 17 00:00:00 2001
|
||||
From ace47b5797decdf1436456851d37cddbc78cda68 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 b79a31c..5556620 100644
|
||||
index 9d240c9..6c1a092 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1364,6 +1364,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1358,6 +1358,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
getHandle().collidesWithEntities = collides;
|
||||
getHandle().k = collides; // First boolean of Entity
|
||||
}
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From c60248d34e0b1c1be08b92ba7fe3fa30392b9605 Mon Sep 17 00:00:00 2001
|
||||
From 08d0172ae952d1fcc324820b650e2d793615700a Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Tue, 5 Aug 2014 17:20:19 +0100
|
||||
Subject: [PATCH] Watchdog Thread.
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index d2d1818..077bf16 100644
|
||||
index 38c634f..8f7bb8b 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -270,7 +270,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
|
@ -38,10 +38,10 @@ index ed66d5e..6cef666 100644
|
|||
org.spigotmc.CustomTimingsHandler.tick(); // Spigot
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index d07b3b8..18ab1ff 100644
|
||||
index 75ea3a5..6368dbe 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1681,6 +1681,11 @@ public final class CraftServer implements Server {
|
||||
@@ -1679,6 +1679,11 @@ public final class CraftServer implements Server {
|
||||
{
|
||||
return org.spigotmc.SpigotConfig.config;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 67e652a56682390e9edec21c3a25bd93508dc9ab Mon Sep 17 00:00:00 2001
|
||||
From c4a828abaeb82576f2b80dd4199fd03dc3697a84 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sun, 1 Dec 2013 18:18:41 +1100
|
||||
Subject: [PATCH] BungeeCord Support
|
||||
|
@ -144,7 +144,7 @@ index a1c5869..c91a695 100644
|
|||
this.d = EnumProtocol.a(packetdataserializer.e());
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 62ee5d5..f56cda1 100644
|
||||
index 747d708..3e9a4ef 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -403,7 +403,7 @@ public abstract class PlayerList {
|
||||
|
@ -157,10 +157,10 @@ index 62ee5d5..f56cda1 100644
|
|||
|
||||
if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index d07b3b8..2801b5c 100644
|
||||
index 6368dbe..f2ace9a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -557,7 +557,13 @@ public final class CraftServer implements Server {
|
||||
@@ -555,7 +555,13 @@ public final class CraftServer implements Server {
|
||||
|
||||
@Override
|
||||
public long getConnectionThrottle() {
|
||||
|
@ -176,10 +176,10 @@ index d07b3b8..2801b5c 100644
|
|||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 5556620..587a55e 100644
|
||||
index 6c1a092..39a73bd 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1353,6 +1353,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1347,6 +1347,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
{
|
||||
|
||||
@Override
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From ba6908d565615b3dce4f455581ea9deed318fb62 Mon Sep 17 00:00:00 2001
|
||||
From 8b1ca7bcaf8dc4526a3e2411424db2931880144a Mon Sep 17 00:00:00 2001
|
||||
From: Thinkofdeath <thethinkofdeath@gmail.com>
|
||||
Date: Fri, 20 Dec 2013 21:36:06 +0000
|
||||
Subject: [PATCH] Particle API
|
||||
|
@ -132,10 +132,10 @@ index fc2a1ab..20e2416 100644
|
|||
|
||||
public Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 587a55e..125fdff 100644
|
||||
index 39a73bd..499c6d2 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -324,9 +324,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -318,9 +318,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public void playEffect(Location loc, Effect effect, int data) {
|
||||
if (getHandle().playerConnection == null) return;
|
||||
|
||||
|
@ -146,7 +146,7 @@ index 587a55e..125fdff 100644
|
|||
}
|
||||
|
||||
@Override
|
||||
@@ -1379,6 +1377,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1373,6 +1371,63 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From c6bf8a476317da9c7f0becfaa6a2f4deaafbcc98 Mon Sep 17 00:00:00 2001
|
||||
From d3ccf96e8655a900b518b35d9acb7dfc75142192 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <git@md-5.net>
|
||||
Date: Mon, 23 Dec 2013 15:57:57 +1100
|
||||
Subject: [PATCH] Disable Connected Check on setScoreboard
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 125fdff..0868ff7 100644
|
||||
index 499c6d2..9998ed8 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1243,7 +1243,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1237,7 +1237,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
throw new IllegalStateException("Cannot set scoreboard yet");
|
||||
}
|
||||
if (playerConnection.isDisconnected()) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From c0fc0c1045109ab22822c09d664da315180026b1 Mon Sep 17 00:00:00 2001
|
||||
From a8eaa20f4a5c1a2828882a220e5d0aa8bd7160aa Mon Sep 17 00:00:00 2001
|
||||
From: Smove <jan@lavasurvival.net>
|
||||
Date: Sat, 1 Feb 2014 18:12:16 +1100
|
||||
Subject: [PATCH] Implement Locale Getter for Players
|
||||
|
@ -18,10 +18,10 @@ index ffdf25c..3438d3a 100644
|
|||
public final MinecraftServer server;
|
||||
public final PlayerInteractManager playerInteractManager;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 0868ff7..de22116 100644
|
||||
index 9998ed8..29c73f0 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1434,6 +1434,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1428,6 +1428,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
getHandle().playerConnection.sendPacket( packet );
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 604c62009070a89c50397eb41a1e79c45e373491 Mon Sep 17 00:00:00 2001
|
||||
From da938d9681d261da9037d85fdcada88ecdee233f Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <md_5@live.com.au>
|
||||
Date: Sat, 8 Feb 2014 08:13:40 +0000
|
||||
Subject: [PATCH] Spam Filter Exclusions
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index e23ee8c..7cad158 100644
|
||||
index 3e1845c..29348eb 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -971,9 +971,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -985,9 +985,20 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
this.minecraftServer.getPlayerList().sendMessage(chatmessage1, false);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 3b245affa462a68053dd26eadbea63306c485bd6 Mon Sep 17 00:00:00 2001
|
||||
From b05cf0c31d35295e9f37b3acbca443de728479b4 Mon Sep 17 00:00:00 2001
|
||||
From: Tux <write@imaginarycode.com>
|
||||
Date: Sun, 9 Feb 2014 14:03:03 -0500
|
||||
Subject: [PATCH] Add support for fetching hidden players
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index de22116..45e7267 100644
|
||||
index 29c73f0..b560f77 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1440,6 +1440,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1434,6 +1434,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
{
|
||||
return getHandle().locale;
|
||||
}
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 6667d6da0ff7e8e34a1b00c76ec30eebd5451c2d Mon Sep 17 00:00:00 2001
|
||||
From 07585e5ab78f2aeb308de2e14586fbcf102c0b36 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <git@md-5.net>
|
||||
Date: Wed, 12 Feb 2014 18:18:01 +1100
|
||||
Subject: [PATCH] Allow Disabling Creative Item Filter
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 7cad158..add3c88 100644
|
||||
index 29348eb..27be388 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1697,7 +1697,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -1711,7 +1711,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
|
||||
boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize();
|
||||
// CraftBukkit - Add invalidItems check
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From eabcc1ffbca1c881f76af678ebed414c8f3ad536 Mon Sep 17 00:00:00 2001
|
||||
From 51d6b94658db8a76b68dcc72ae0fa46b2ac880bd Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <git@md-5.net>
|
||||
Date: Wed, 12 Feb 2014 20:02:58 +1100
|
||||
Subject: [PATCH] Cap Channel Registrations
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 45e7267..7460af5 100644
|
||||
index b560f77..5604506 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1063,6 +1063,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1057,6 +1057,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
}
|
||||
|
||||
public void addChannel(String channel) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From a6d14a071893aac9f8e51430799e821d78f2a2bb Mon Sep 17 00:00:00 2001
|
||||
From f0257e263dd71c77ed223564ed24569bc6f1f882 Mon Sep 17 00:00:00 2001
|
||||
From: hcherndon <hcherndon@gmail.com>
|
||||
Date: Sat, 15 Feb 2014 01:51:20 -0600
|
||||
Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
|
|||
This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 26fc3b8..c1535f9 100644
|
||||
index 27be388..62677fe 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -2060,7 +2060,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -2074,7 +2074,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
}
|
||||
|
||||
// CraftBukkit start - Add "isDisconnected" method
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 4d46e3a6accb1e69517023ab23de974ef27fcc48 Mon Sep 17 00:00:00 2001
|
||||
From 552b329c280c0d4fe152ef8a21f621975fcb4832 Mon Sep 17 00:00:00 2001
|
||||
From: drXor <mcyoungsota@gmail.com>
|
||||
Date: Sat, 15 Mar 2014 01:30:05 -0400
|
||||
Subject: [PATCH] Descriptive kick reasons instead of Nope!
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 82accf4..d6bef0b 100644
|
||||
index 7e87687..1c053c5 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -209,7 +209,7 @@ public abstract class Entity implements ICommandListener {
|
||||
|
@ -27,10 +27,10 @@ index 82accf4..d6bef0b 100644
|
|||
f1 = 0;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index d8f5480..7eb563b 100644
|
||||
index 62677fe..66d897d 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -894,7 +894,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -908,7 +908,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
this.player.resetIdleTimer();
|
||||
} else {
|
||||
PlayerConnection.c.warn(this.player.getName() + " tried to set an invalid carried item");
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 30e4478bc9e5219a4d2869546172e79bb0de2607 Mon Sep 17 00:00:00 2001
|
||||
From 74b9a459b26b07780e8d019afd9ff119142b6733 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <git@md-5.net>
|
||||
Date: Mon, 14 Apr 2014 17:21:24 +1000
|
||||
Subject: [PATCH] Check for blank OfflinePlayer Names
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index f828b35..15985f9 100644
|
||||
index ec5b77a..8b9c9a3 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1287,6 +1287,7 @@ public final class CraftServer implements Server {
|
||||
@@ -1285,6 +1285,7 @@ public final class CraftServer implements Server {
|
||||
@Deprecated
|
||||
public OfflinePlayer getOfflinePlayer(String name) {
|
||||
Validate.notNull(name, "Name cannot be null");
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From ae9f7a8aaa697405394ce50dd8a75824715a72fb Mon Sep 17 00:00:00 2001
|
||||
From 339cf836d006a4de09aaae61cfada32f5fa90d5d Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <git@md-5.net>
|
||||
Date: Sun, 20 Apr 2014 18:58:00 +1000
|
||||
Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs.
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 15985f9..fddfb24 100644
|
||||
index 8b9c9a3..e0fb365 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1289,11 +1289,6 @@ public final class CraftServer implements Server {
|
||||
@@ -1287,11 +1287,6 @@ public final class CraftServer implements Server {
|
||||
Validate.notNull(name, "Name cannot be null");
|
||||
com.google.common.base.Preconditions.checkArgument( !org.apache.commons.lang.StringUtils.isBlank( name ), "Name cannot be blank" ); // Spigot
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 3e89e455b100207f1f954e13ab8f89d7c2e98dcb Mon Sep 17 00:00:00 2001
|
||||
From 316ae5c2a9389cef2783b662dc9176f66c1af6ad Mon Sep 17 00:00:00 2001
|
||||
From: riking <rikingcoding@gmail.com>
|
||||
Date: Wed, 14 May 2014 13:46:48 -0700
|
||||
Subject: [PATCH] Process conversation input on the main thread. Fixes
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes
|
|||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 7eb563b..43367dd 100644
|
||||
index 66d897d..1d437f3 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -956,7 +956,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -970,7 +970,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
} else if (s.isEmpty()) {
|
||||
c.warn(this.player.getName() + " tried to send an empty message");
|
||||
} else if (getPlayer().isConversing()) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From a0abacdfc37269d8eb814ba87c6e22a51cefaed9 Mon Sep 17 00:00:00 2001
|
||||
From ddae5d95c6f6b3948a90dba0fcb58c1419b407c1 Mon Sep 17 00:00:00 2001
|
||||
From: drXor <mcyoungsota@gmail.com>
|
||||
Date: Fri, 23 May 2014 18:05:10 -0400
|
||||
Subject: [PATCH] Configurable save-on-stop-only for UserCache
|
||||
|
@ -24,9 +24,18 @@ index 08efc91..5230d6d 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
|
||||
index 8001b8a..4450ea3 100644
|
||||
index 8001b8a..85277a6 100644
|
||||
--- a/src/main/java/net/minecraft/server/UserCache.java
|
||||
+++ b/src/main/java/net/minecraft/server/UserCache.java
|
||||
@@ -121,7 +121,7 @@ public class UserCache {
|
||||
this.c.put(gameprofile.getName().toLowerCase(Locale.ROOT), usercache_usercacheentry);
|
||||
this.d.put(uuid, usercache_usercacheentry);
|
||||
this.e.addFirst(gameprofile);
|
||||
- this.c();
|
||||
+ if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.c(); // Spigot - skip saving if disabled
|
||||
}
|
||||
|
||||
public GameProfile getProfile(String s) {
|
||||
@@ -149,7 +149,7 @@ public class UserCache {
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 0f5edd78e296a9dcc6bde38e6018235de78f8984 Mon Sep 17 00:00:00 2001
|
||||
From d8bc7dc9821978c1e96ece42247fcd9afc2f69ed Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Krieger <Slizyboy@hotmail.com>
|
||||
Date: Tue, 24 Dec 2013 07:55:23 -0800
|
||||
Subject: [PATCH] Cross World Entity Teleportation
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Cross World Entity Teleportation
|
|||
Use Entity.teleportTo for cross-world teleportation in CraftEntity.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
index 9df27e3..9030f2c 100644
|
||||
index 89cbb45..725870a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -231,7 +231,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
@@ -232,7 +232,14 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
// If this entity is riding another entity, we must dismount before teleporting.
|
||||
entity.mount(null);
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From b0893293463044447ddf36e23a571026dd0ba404 Mon Sep 17 00:00:00 2001
|
||||
From 653dc6de7150c294c5f5404a872d2a3daf4c3e8a Mon Sep 17 00:00:00 2001
|
||||
From: Thinkofdeath <thinkofdeath@spigotmc.org>
|
||||
Date: Sun, 29 Jun 2014 21:10:34 +0100
|
||||
Subject: [PATCH] Limit block placement/interaction packets
|
||||
|
@ -24,10 +24,10 @@ index c611db1..28cb5e3 100644
|
|||
public void b(PacketDataSerializer packetdataserializer) throws IOException {}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 43367dd..aac4851 100644
|
||||
index 1d437f3..1e5bff1 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -628,9 +628,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -642,9 +642,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
|
@ -50,7 +50,7 @@ index 43367dd..aac4851 100644
|
|||
|
||||
// CraftBukkit start
|
||||
if (this.player.dead) return;
|
||||
@@ -654,7 +667,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -668,7 +681,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
|
||||
// CraftBukkit start
|
||||
int itemstackAmount = itemstack.count;
|
||||
|
@ -60,7 +60,7 @@ index 43367dd..aac4851 100644
|
|||
// Raytrace to look for 'rogue armswings'
|
||||
float f1 = this.player.pitch;
|
||||
float f2 = this.player.yaw;
|
||||
@@ -690,6 +704,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -704,6 +718,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
if (!cancelled) {
|
||||
this.player.playerInteractManager.useItem(this.player, this.player.world, itemstack);
|
||||
}
|
||||
|
@ -69,7 +69,7 @@ index 43367dd..aac4851 100644
|
|||
|
||||
// CraftBukkit - notch decrements the counter by 1 in the above method with food,
|
||||
// snowballs and so forth, but he does it in a place that doesn't cause the
|
||||
@@ -715,7 +731,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -729,7 +745,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
}
|
||||
|
||||
if (this.checkMovement && this.player.e((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && !this.minecraftServer.a(worldserver, blockposition, this.player) && worldserver.getWorldBorder().a(blockposition)) {
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 66f142c97e690ec9d271cc9dcdf6dae0ddf12262 Mon Sep 17 00:00:00 2001
|
||||
From 4ec6e6d9f75473b9bc9eb14730e745576734f75d Mon Sep 17 00:00:00 2001
|
||||
From: Thinkofdeath <thinkofdeath@spigotmc.org>
|
||||
Date: Sat, 19 Jul 2014 19:54:41 +0100
|
||||
Subject: [PATCH] Prevent a crash involving attributes
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 7460af5..33547eb 100644
|
||||
index 5604506..95c5fb3 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1313,7 +1313,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1307,7 +1307,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From a0b1ec213579d149b1699edf159e94bf1e920d5a Mon Sep 17 00:00:00 2001
|
||||
From 51e9c510d10f76c98058aebb0aa2e2c408141243 Mon Sep 17 00:00:00 2001
|
||||
From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
|
||||
Date: Wed, 30 Jul 2014 01:19:51 +0200
|
||||
Subject: [PATCH] Only fetch an online UUID in online mode
|
||||
|
@ -12,10 +12,10 @@ You want to store data for player "Test" who never joined. An online UUID is cr
|
|||
The player Test joins with an offline UUID but that will not match the online UUID of the saved data.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index fddfb24..050c188 100644
|
||||
index e0fb365..e151098 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1291,8 +1291,14 @@ public final class CraftServer implements Server {
|
||||
@@ -1289,8 +1289,14 @@ public final class CraftServer implements Server {
|
||||
|
||||
OfflinePlayer result = getPlayerExact(name);
|
||||
if (result == null) {
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From fcff84cefce17a4b1ce7d468a6e5a868e972e5c0 Mon Sep 17 00:00:00 2001
|
||||
From 31d25787ca265f644141847830548922e666faed Mon Sep 17 00:00:00 2001
|
||||
From: libraryaddict <redwarfare@live.com>
|
||||
Date: Fri, 22 Aug 2014 05:35:16 -0400
|
||||
Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
index 88b197d..bc35387 100644
|
||||
index dcb9252..eaaa6a1 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
@@ -217,6 +217,8 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
||||
|
@ -118,7 +118,7 @@ index 88b197d..bc35387 100644
|
|||
DISPLAY.NBT,
|
||||
REPAIR.NBT,
|
||||
ENCHANTMENTS.NBT,
|
||||
@@ -956,6 +992,19 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
||||
@@ -957,6 +993,19 @@ class CraftMetaItem implements ItemMeta, Repairable {
|
||||
// Spigot start
|
||||
private final Spigot spigot = new Spigot()
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 5c2836e4d9ce3e83b38d3fc0f89b28f65d6706a0 Mon Sep 17 00:00:00 2001
|
||||
From d75790ba950e9943253bf4af2df1dda617b21b02 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <git@md-5.net>
|
||||
Date: Sat, 13 Dec 2014 13:06:05 +1100
|
||||
Subject: [PATCH] BungeeCord Chat API
|
||||
|
@ -56,7 +56,7 @@ index 0000000..6cd5df2
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 0438755..cd9ca4d 100644
|
||||
index e151098..df34ddc 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -121,6 +121,7 @@ import io.netty.buffer.ByteBufOutputStream;
|
||||
|
@ -67,7 +67,7 @@ index 0438755..cd9ca4d 100644
|
|||
|
||||
public final class CraftServer implements Server {
|
||||
private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];
|
||||
@@ -1706,6 +1707,20 @@ public final class CraftServer implements Server {
|
||||
@@ -1704,6 +1705,20 @@ public final class CraftServer implements Server {
|
||||
public void restart() {
|
||||
org.spigotmc.RestartCommand.restart();
|
||||
}
|
||||
|
@ -89,7 +89,7 @@ index 0438755..cd9ca4d 100644
|
|||
|
||||
public Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 33547eb..e52e615 100644
|
||||
index 95c5fb3..35608b7 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -19,6 +19,7 @@ import java.util.Set;
|
||||
|
@ -100,7 +100,7 @@ index 33547eb..e52e615 100644
|
|||
|
||||
import net.minecraft.server.*;
|
||||
import net.minecraft.server.PacketPlayOutTitle.EnumTitleAction;
|
||||
@@ -1461,6 +1462,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -1455,6 +1456,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
||||
return java.util.Collections.unmodifiableSet( ret );
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From afb701ae339e92d7c574baec7d09a3b0affa123d Mon Sep 17 00:00:00 2001
|
||||
From 9b4c6412b90ef97bf2d1795b3cc8cca78ce88670 Mon Sep 17 00:00:00 2001
|
||||
From: md_5 <git@md-5.net>
|
||||
Date: Wed, 22 Jul 2015 19:04:37 +1000
|
||||
Subject: [PATCH] Clear Packet Queue on Disconnect
|
||||
|
@ -17,10 +17,10 @@ index 247973d..9d23c6c 100644
|
|||
NetworkManager.g.warn("handleDisconnection() called twice");
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index dce0ac4..e380774 100644
|
||||
index a6d8b96..2124daa 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -868,7 +868,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
@@ -882,7 +882,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
||||
}
|
||||
|
||||
// CraftBukkit start
|
||||
|
|
Loading…
Reference in a new issue