twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 02:02:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Upstate upstream B/CB

Browse Source 
--- work/Bukkit
Submodule work/Bukkit 9a793cce8..0c1d258bb:
  > Make PigZapEvent extend EntityTransformEvent

--- work/CraftBukkit
Submodule work/CraftBukkit ee6684bba..6a398ac44:
  > SPIGOT-4511: Trident doesn't lose durability
  > Tweak outdated windows
This commit is contained in:
Zach Brown
2018-12-02 18:31:09 -05:00
parent c9340dc439
commit 9bfaa301aa
53 changed files with 181 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/Mob-Pathfinding-API.patch
View File

@@ -7,7 +7,7 @@ Implements Pathfinding API for mobs
diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
new file mode 100644
index 7ac07ac07ac0..7ac07ac07ac0
index 000000000..ed3d86ddd
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
@@ -0,0 +0,0 @@
@@ -125,7 +125,7 @@ index 7ac07ac07ac0..7ac07ac07ac0
+ }
+}
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index efdfa7195..113fd9a50 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -0,0 +0,0 @@ public abstract class NavigationAbstract {
@@ -173,7 +173,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
this.c = null;
diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 5ffcda6d5..dae08cbbf 100644
--- a/src/main/java/net/minecraft/server/PathEntity.java
+++ b/src/main/java/net/minecraft/server/PathEntity.java
@@ -0,0 +0,0 @@ package net.minecraft.server;
@@ -212,7 +212,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
return new Vec3D((double)pathpoint.a, (double)pathpoint.b, (double)pathpoint.c);
}
diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 497f47223..7fd1eff0b 100644
--- a/src/main/java/net/minecraft/server/PathPoint.java
+++ b/src/main/java/net/minecraft/server/PathPoint.java
@@ -0,0 +0,0 @@
@@ -229,7 +229,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
public int d = -1;
public float e;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 5bf1cd06f..53c2d154e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
@@ -0,0 +0,0 @@ import org.bukkit.loot.LootTable;