OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update from upstream SpigotMC

Browse source 
eb39b4729ce
59b08be5833
a723278f74a
This commit is contained in:
Zach Brown 2015-01-04 20:01:24 -06:00
parent b7fb738d91
commit 1e81634a9d
6 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch
View file

@ -8,7 +8,7 @@ diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/buk
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Entity.java --- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -0,0 +0,0 @@ public interface Entity extends Metadatable { @@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender {
* @return if the custom name is displayed * @return if the custom name is displayed
*/ */
public boolean isCustomNameVisible(); public boolean isCustomNameVisible();

4
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View file

@ -68,8 +68,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public boolean isCustomNameVisible() { public void setOp(boolean value) {
return getHandle().getCustomNameVisible(); perm.setOp(value);
} }
+ +
+ // Spigot start + // Spigot start

1
CraftBukkit-Patches/0016-Metrics.patch
View file

@ -655,7 +655,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ } + }
+} +}
\ No newline at end of file
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java --- a/src/main/java/org/spigotmc/SpigotConfig.java

7
CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch
View file

@ -39,13 +39,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
int j = statistic.d() ? this.getStatisticValue(statistic) : 0; int j = statistic.d() ? this.getStatisticValue(statistic) : 0;
super.setStatistic(entityhuman, statistic, i); super.setStatistic(entityhuman, statistic, i);
@@ -0,0 +0,0 @@ public class ServerStatisticManager extends StatisticManager {
return this.g;
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java --- a/src/main/java/org/spigotmc/SpigotConfig.java

4
CraftBukkit-Patches/0113-Convert-player-skulls-async.patch
View file

@ -124,7 +124,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ setSkullType( 3 ); // Work around client bug + setSkullType( 3 ); // Work around client bug
+ g = input; + g = input;
+ update(); + update();
+ world.notify(position); + if (world != null) {
+ world.notify(position);
+ }
+ return false; + return false;
+ } + }
+ }); + });

7
CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch
View file

@ -17,13 +17,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
private Map d = Maps.newHashMap(); private Map d = Maps.newHashMap();
public PersistentCollection(IDataManager idatamanager) { public PersistentCollection(IDataManager idatamanager) {
@@ -0,0 +0,0 @@ public class PersistentCollection {
return oshort.shortValue();
}
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java