Update upstream B/CB/S
This commit is contained in:
@@ -26,7 +26,7 @@ index 621c585e..da0984a3 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index cec9ea74..39f8a0a2 100644
|
||||
index 64e31dd2..a5986593 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -0,0 +0,0 @@ package com.destroystokyo.paper;
|
||||
@@ -155,7 +155,7 @@ index ab793307..5c09c6ff 100644
|
||||
this.methodProfiler.a("tallying");
|
||||
// Spigot start
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 30ca137e..953e5f90 100644
|
||||
index f38e8197..7a9b7912 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -0,0 +0,0 @@ public abstract class PlayerList {
|
||||
|
||||
Reference in New Issue
Block a user