OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rebuild patches

Browse source
This commit is contained in:
Zach Brown 2015-09-01 20:14:41 -05:00
parent e006d41117
commit 3d490255dc
5 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Spigot-Server-Patches/Configurable-top-of-nether-void-damage.patch
View file

@ -47,5 +47,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
} }
-- --
1.9.5.msysgit.1

2
Spigot-Server-Patches/Disable-explosion-knockback.patch
View file

@ -67,5 +67,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
} }
-- --
1.9.5.msysgit.1

10
Spigot-Server-Patches/Force-load-chunks-for-specific-entities-that-fly-thr.patch
View file

@ -31,8 +31,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener { @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
public boolean valid; // CraftBukkit
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
public boolean inUnloadedChunk = false; // PaperSpigot - Remove entities in unloaded chunks public boolean inUnloadedChunk = false; // PaperSpigot - Remove entities in unloaded chunks
+ public boolean loadChunks = false; // PaperSpigot - Entities can load chunks they move through and keep them loaded + public boolean loadChunks = false; // PaperSpigot - Entities can load chunks they move through and keep them loaded
@ -52,6 +52,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ } + }
+ } + }
+
+ +
public void move(double d0, double d1, double d2) { public void move(double d0, double d1, double d2) {
org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.startTiming(); // Spigot org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.startTiming(); // Spigot
@ -114,6 +115,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
// CraftBukkit start // CraftBukkit start
// float f = 4.0F; // float f = 4.0F;
- -
+
+ // PaperSpigot start - Force load chunks during TNT explosions + // PaperSpigot start - Force load chunks during TNT explosions
+ ChunkProviderServer chunkProviderServer = ((ChunkProviderServer) world.chunkProvider); + ChunkProviderServer chunkProviderServer = ((ChunkProviderServer) world.chunkProvider);
+ boolean forceChunkLoad = chunkProviderServer.forceChunkLoad; + boolean forceChunkLoad = chunkProviderServer.forceChunkLoad;
@ -121,6 +123,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ chunkProviderServer.forceChunkLoad = true; + chunkProviderServer.forceChunkLoad = true;
+ } + }
+ // PaperSpigot end + // PaperSpigot end
+
org.bukkit.craftbukkit.CraftServer server = this.world.getServer(); org.bukkit.craftbukkit.CraftServer server = this.world.getServer();
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) org.bukkit.craftbukkit.entity.CraftEntity.getEntity(server, this)); ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) org.bukkit.craftbukkit.entity.CraftEntity.getEntity(server, this));
@ -128,6 +131,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.world.createExplosion(this, this.locX, this.locY + (double) (this.length / 2.0F), this.locZ, event.getRadius(), event.getFire(), true); this.world.createExplosion(this, this.locX, this.locY + (double) (this.length / 2.0F), this.locZ, event.getRadius(), event.getFire(), true);
} }
// CraftBukkit end // CraftBukkit end
+
+ // PaperSpigot start - Force load chunks during TNT explosions + // PaperSpigot start - Force load chunks during TNT explosions
+ if (world.paperSpigotConfig.loadUnloadedTNTEntities) { + if (world.paperSpigotConfig.loadUnloadedTNTEntities) {
+ chunkProviderServer.forceChunkLoad = forceChunkLoad; + chunkProviderServer.forceChunkLoad = forceChunkLoad;
@ -193,10 +197,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
SpigotTimings.checkIfActiveTimer.startTiming(); SpigotTimings.checkIfActiveTimer.startTiming();
// Never safe to skip fireworks or entities not yet added to chunk // Never safe to skip fireworks or entities not yet added to chunk
- if ( !entity.isAddedToChunk() || entity instanceof EntityFireworks ) { - if ( !entity.isAddedToChunk() || entity instanceof EntityFireworks ) {
+ if ( !entity.isAddedToChunk() || entity instanceof EntityFireworks || entity.loadChunks ) { + if ( !entity.isAddedToChunk() || entity instanceof EntityFireworks || entity.loadChunks ) { // PaperSpigot
SpigotTimings.checkIfActiveTimer.stopTiming(); SpigotTimings.checkIfActiveTimer.stopTiming();
return true; return true;
} }
-- --
1.9.5.msysgit.1

4
Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
View file

@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener { @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
private final CommandObjectiveExecutor au;
public boolean valid; // CraftBukkit public boolean valid; // CraftBukkit
public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
public boolean forceExplosionKnockback; // CraftBukkit - SPIGOT-949
+ public boolean inUnloadedChunk = false; // PaperSpigot - Remove entities in unloaded chunks + public boolean inUnloadedChunk = false; // PaperSpigot - Remove entities in unloaded chunks
// Spigot start // Spigot start
@ -116,5 +116,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
} }
-- --
1.9.5.msysgit.1

2
Spigot-Server-Patches/Teleport-passenger-vehicle-with-player.patch
View file

@ -97,5 +97,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
-- --
1.9.5.msysgit.1