Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
cce3635
Update branch for github version checking
Sep 13, 2018
ec58c20
Performance & Concurrency Improvements to Permissions
aikar Sep 14, 2018
1571211
Optimize Region File Cache
aikar Sep 16, 2018
4909d13
Sync Player Position to Vehicles
aikar Sep 21, 2018
e0a25a9
Fix NPE race condition in ServerListPingEvent
BillyGalbreath Sep 23, 2018
9759652
Backport light queue changes from 1.13
aikar Sep 24, 2018
69c8e71
Allow zero revive health when it matches maxHealth
Sep 25, 2018
c1cd618
Update 1.12.2 distribution info just in case
Sep 25, 2018
de97725
Re-add toggle for light queue, bump queue time
aikar Sep 26, 2018
22fd638
Fix issues with entity loss due to unloaded chunks
aikar Sep 28, 2018
a690c97
Backport Village Door fix from 1.13
aikar Sep 29, 2018
7ec576d
Fix cancelled lootables
Sep 30, 2018
3ac4505
Fix bug in the last commit for loot table fix
aikar Oct 2, 2018
6737095
Backport light fix for recheck gaps
aikar Oct 6, 2018
f949449
Backport Water Activation Range
aikar Oct 6, 2018
c353860
Backport: Prevent mob spawning from loading/generating chunks
electronicboy Oct 8, 2018
87d2e76
Fix oversight in behavior of last patch
electronicboy Oct 8, 2018
583be93
Fix inversion issue in last patch
electronicboy Oct 11, 2018
33d2de5
Improve Village Door fix to not merge villages (Iron Titan)
aikar Oct 12, 2018
b91846a
Backport Detect and recover from corrupt region files
aikar Oct 12, 2018
8601385
Further improve village door code for 1.12
aikar Oct 12, 2018
be4fc8c
Backport the dupe uuid and entity log changes
aikar Oct 12, 2018
ca8dc1b
Actually fix mob spawning for real
aikar Oct 12, 2018
fce9e20
MC-54026: Backport 1.13 client desync fix on fast tools
aikar Oct 18, 2018
e7245e6
Backport Timings improvements from 1.13
aikar Oct 18, 2018
b15c43a
Update upstream for minecart spawner improvement
zachbr Oct 23, 2018
4297106
Do not let the server load chunks from newer versions
zachbr Oct 24, 2018
857123a
Keep players yaw/pitch on vehicle updates
aikar Nov 3, 2018
67787d3
Fix server icon encoding to show on newer clients
zachbr Nov 6, 2018
531dfad
Fix PreFillProfileEvent
Black-Hole Nov 9, 2018
07c7973
Limit Book Sizes
aikar Nov 17, 2018
a62a778
Specify charset explicitly on getBytes
aikar Nov 17, 2018
cfe5920
Prevent rayTrace from loading chunks
aikar Nov 27, 2018
b82359e
Persist ArmorStand canTick API value across restarts
zachbr Nov 27, 2018
cedf38a
Handle Large Packets disconnecting client
aikar Nov 28, 2018
ea0646b
backport: SPIGOT-2719: Comparator and Observer don't trigger BlockRed…
Amosar Dec 1, 2018
cbd7003
Update upstream CB/S
zachbr Dec 7, 2018
ac69748
Cleanup after plugins which don't sucessfully enable
electronicboy Dec 7, 2018
2ee16de
Ensure the passenger player gets retracked by the vehicle player on d…
vectrixdevelops Jan 1, 2019
af759c3
Address some issues with book limits (#1798)
electronicboy Jan 12, 2019
e8f86cb
Allow Saving of Oversized Chunks - READ COMMIT DETAILS!!!
aikar Feb 16, 2019
132c2c5
Fix loot table restriction when replenish is disabled - Fixes #1860
aikar Feb 16, 2019
64efe67
Update default book configs to match 1.13.2
aikar Feb 16, 2019
5719e12
Updated Upstream (Spigot)
aikar Feb 23, 2019
1627071
Improvements to Timings concurrency and lookup performance
aikar Feb 23, 2019
087a5e9
Strip extra Sign data to/from client - #1876
aikar Feb 28, 2019
4ba151e
Fix incorrect check on vehicle for auto dismount
aikar Feb 28, 2019
627b6de
Apply sign limits to signs text content
electronicboy Feb 28, 2019
c66f02b
Backport: Fix NPE during server initialization from server list pings
electronicboy Feb 28, 2019
3d60b70
Backport: Fire PlayerArmorChangeEvent for more cases
zachbr Mar 3, 2019
013f8d2
Remove outbound string length limits on signs, improve codepoint logic
aikar Mar 5, 2019
d70aa91
don't check convert signs boolean every sign save
aikar Mar 5, 2019
ab99f9d
Handle Excessive Signs in Chunks creating too large of packets
aikar Mar 5, 2019
0b1a9b2
MC-145260: Fix Whitelist On/Off inconsistency - Fixes #1880
aikar Mar 5, 2019
677997f
Remove Entity slice debug logs
aikar Mar 5, 2019
14eac29
Backport Timings Improvements
aikar Mar 24, 2019
f81358a
Update entity Metadata for all tracked players
Mar 24, 2019
745476f
don't go below 0 for pickupDelay, breaks picking up items
aikar Mar 24, 2019
2d68918
missed a spot for pickupDelay fix
aikar Mar 24, 2019
1073a39
Fix plugin errors corrupting timings stack
aikar Mar 26, 2019
5e4ae76
Fix null task issue with timings
aikar Mar 26, 2019
e0847a4
Reuse buffers for chunk compression to optimize memory use
aikar Mar 29, 2019
3b0b967
Allow disabling village sieges entirely
zachbr Apr 7, 2019
b8c184a
Backport changes to deprecated CustomTimingsHandler
zachbr Apr 7, 2019
8f7f4cf
Don't drop items into the world if BlockPlaceEvent is cancelled (Fixe…
electronicboy Apr 14, 2019
f59f630
Backport some fixes from newer versions
zachbr Jun 3, 2019
cf582da
Anti-Xray improvements (#2226)
Spottedleaf Jun 24, 2019
0626875
Queue log events when log buffer is full
Spottedleaf Jun 30, 2019
33d42c8
Merge pull request #2264 from Spottedleaf/fix-logging2
Jun 30, 2019
77cce82
Backport map maker workflow fix for #2221
zachbr Jul 14, 2019
1dfc5fe
shellcheck
nothub May 24, 2021
36644c9
skeleton origin
nothub May 24, 2021
d4e2f15
readme, contrib
nothub May 24, 2021
a254fdc
metrics opt in
nothub May 24, 2021
6c71df1
dependabot
nothub May 24, 2021
29e615b
github ci
nothub May 24, 2021
6bd2c7a
disable ci maven dependency caching
nothub May 24, 2021
1d3ca61
tag release at epoch script
nothub May 24, 2021
618705b
rename ci jobs
nothub May 24, 2021
64b49df
map icon limit
nothub May 24, 2021
2c29cf0
markdown is hard
nothub May 24, 2021
17036c3
make pathfinder selection delay configurable
nothub May 24, 2021
9f41d9a
add missing PathfinderGoalSelector
nothub May 24, 2021
6b0cf2b
do not contact paper devs
nothub May 24, 2021
63119d4
update paperclip subrepo
nothub May 24, 2021
24b2cdb
chunk dupe
nothub May 24, 2021
2fb61fb
sane config defaults
nothub May 24, 2021
1bf3211
maven dependency caching
nothub May 24, 2021
e50c9ab
configurable brand name
nothub May 24, 2021
41953c5
release desc
nothub May 24, 2021
717ef63
test server http origin
nothub May 24, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
time: "12:00"
timezone: "Europe/Berlin"
assignees:
- "nothub"
reviewers:
- "nothub"
commit-message:
prefix: "maven"
include: "scope"

54 changes: 54 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: release

on:
push:
tags:
- '*'

jobs:
release:
runs-on: ubuntu-latest
steps:

- name: checkout changes
uses: actions/checkout@v2

- name: get commit info
run: echo "SHA=$GITHUB_SHA" >> $GITHUB_ENV

- name: prepare java 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: prepare depdendency cache
uses: actions/cache@v2
with:
path: ~/.m2
key: '${{ runner.os }}-m2-${{ hashFiles(''**/pom.xml'') }}'
restore-keys: '${{ runner.os }}-m2'

- name: prepare git config
run: git config --global user.name "CI Slave Bot"

- name: build paper
run: ./paper jar

- name: prepare release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: ${{ github.ref }}
body: release at commit ${{ env.SHA }}
draft: false
prerelease: false

- name: upload release
uses: csexton/release-asset-action@v2
with:
file: "paperclip.jar"
github-token: ${{ secrets.GITHUB_TOKEN }}
release-url: ${{ steps.create_release.outputs.upload_url }}
38 changes: 38 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: test

on:
push:
branches:
- '*'

jobs:
test:
runs-on: ubuntu-latest
steps:

- name: checkout changes
uses: actions/checkout@v2

- name: get commit info
run: echo "SHA=$GITHUB_SHA" >> $GITHUB_ENV

- name: prepare java 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: prepare depdendency cache
uses: actions/cache@v2
with:
path: ~/.m2
key: '${{ runner.os }}-m2-${{ hashFiles(''**/pom.xml'') }}'
restore-keys: '${{ runner.os }}-m2'

- name: prepare git config
run: git config --global user.name "CI Slave Bot"

- name: patch paper
run: ./paper patch

- name: test
run: mvn test --file pom.xml --batch-mode --errors --show-version
81 changes: 81 additions & 0 deletions CONTRIB-TLDR.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
#### compile

To compile Paper, you need __JDK 8__, __maven__, and an internet connection.
Clone this repo, run `./paper jar` from __bash__, grab `paperclip.jar`.

#### build jar

(in project root!)
`./paper jar`

#### create a patch

move to `./Paper-Server` or `./Paper-API`
work on files in (probably) `Paper-Server`
to finalize patch
(in the sub repo folder!)
`git add .`
`git commit`

#### convert committed changes to patch

(in project root!)
`./paper rebuild`
`./paper jar`

#### run test server

(in project root!)
`./paper test`

#### prepare pull request

when everything is fine:
(in project root!)
`git checkout -b antigravity-generator-patch`
`git add Spigot-Server-Patches/0420-antigravity-generator-patch.patch`
`git commit`
`git push --set-upstream origin antigravity-generator-patch`

#### edit patches (continue working on saved state)

(in project root!)
run `./paper edit server`, for the patch you want to edit, replace the prefix `pick` with `edit`.
save and close the file, `./Paper-Server` is prepared now.
do code changes and when done, run: `./paper edit continue`
see [CONTRIBUTING.md](https://github.com/nothub/paper-1.12.2/blob/master/CONTRIBUTING.md) Modifying Patches -> Method 1

#### patch untouched vanilla code

if you want to patch code that is not yet listed in the Paper-Server subrepo:
go to `./work/Minecraft/1.12.2/net/minecraft/server`, check for the thing that need patching
open `./scripts/importmcdev.sh` and add the corresponding import to the list
in project root, run: `./paper patch`
the needed classes should be listed in `./Paper-Server` now
for everything advanced, read [CONTRIBUTING.md](https://github.com/nothub/paper-1.12.2/blob/master/CONTRIBUTING.md)

#### sha1 information is lacking or useless / could not build fake ancestor

```
error: sha1 information is lacking or useless (src/main/java/net/minecraft/server/PathfinderGoalSelector.java).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0153 configurable pathfinder goal selection delay
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Something did not apply cleanly to Paper-Server.
Please review above details and finish the apply then
save the changes with rebuildPatches.sh

Because you're on Windows you'll need to finish the AM,
rebuild all patches, and then re-run the patch apply again.
Consider using the scripts with Windows Subsystem for Linux.
Failed to apply Paper Patches
Failed to build Paper
```

an error with this message (sha1 information is lacking or useless / could not build fake ancestor) is most likely
caused by a missing import in `./scripts/importmcdev.sh`.

for further info, read: [CONTRIBUTING.md](https://github.com/nothub/paper-1.12.2/blob/master/CONTRIBUTING.md)
43 changes: 7 additions & 36 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,12 @@
Paper [![Build Status](https://destroystokyo.com/ci/job/Paper/badge/icon)](https://destroystokyo.com/ci/job/Paper/)
===========
## paper-1.12.2

High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.
lazy fork of [Paper](https://github.com/PaperMC/Paper/tree/ver/1.12.2) for mc version 1.12.2

[IRC Support and Project Discussion](http://irc.spi.gt/iris/?channels=paper)
#### contributing

[Discord](https://discord.gg/jETyjUw)
[CONTRIB-TLDR.md](https://github.com/nothub/paper-1.12.2/blob/master/CONTRIB-TLDR.md)

#### thanks

Documentation
------
Access the Paper docs here: [paper.readthedocs.io](https://paper.readthedocs.io/)
Access the Paper API javadocs here: [destroystokyo.com/javadocs](https://destroystokyo.com/javadocs/)

How To (Server Admins)
------
Paperclip is a jar file that you can download and run just like a normal jar file.

Download a copy of paperclip.jar from [our build server, here](https://destroystokyo.com/ci/job/PaperSpigot/).

Run the Paperclip jar directly from your server. Just like old times

Paper requires [**Java 8**](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) or above.

How To (Compiling Jar From Source)
------
To compile Paper, you need JDK 8, maven, and an internet connection.

Clone this repo, run `./paper jar` from *bash*, get files.

How To (Pull Request)
------
See [Contributing](CONTRIBUTING.md)

Special Thanks To:
-------------

![YourKit-Logo](https://www.yourkit.com/images/yklogo.png)

[YourKit](http://www.yourkit.com/), makers of the outstanding java profiler, support open source projects of all kinds with their full featured [Java](https://www.yourkit.com/java/profiler/index.jsp) and [.NET](https://www.yourkit.com/.net/profiler/index.jsp) application profilers. We thank them for granting Paper an OSS license so that we can make our software the best it can be.
[Paper](https://github.com/PaperMC/Paper/tree/ver/1.12.2), [Bukkit](https://bukkit.org)
and [Spigot](https://spigotmc.org) <3
71 changes: 33 additions & 38 deletions Spigot-API-Patches/0001-POM-changes.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 7836876ec5222a072d9d65d965f4edcc0ea8bbe4 Mon Sep 17 00:00:00 2001
From f689646087896900f4b4a46521b3a5d5487184b3 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 00:16:08 +0100
Subject: [PATCH] POM changes


diff --git a/pom.xml b/pom.xml
index 7c81917d..4c5bda27 100644
index 7c81917d..3889d668 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,39 +3,39 @@
@@ -3,46 +3,46 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -40,50 +40,45 @@ index 7c81917d..4c5bda27 100644
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<distributionManagement>
<repository>
- <distributionManagement>
- <repository>
- <id>spigotmc-releases</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
+ <id>destroystokyo-releases</id>
+ <url>https://destroystokyo.com/repo/repository/maven-releases/</url>
</repository>
<snapshotRepository>
- </repository>
- <snapshotRepository>
- <id>spigotmc-snapshots</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+ <id>destroystokyo-snapshots</id>
+ <url>https://destroystokyo.com/repo/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>

- <repositories>
- <repository>
- <id>spigotmc-public</id>
- <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
- </repository>
- </repositories>
-
<pluginRepositories>
<pluginRepository>
<id>spigotmc-public</id>
@@ -43,6 +43,17 @@
</pluginRepository>
</pluginRepositories>

+ <repositories>
+ <repository>
- </snapshotRepository>
- </distributionManagement>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>spigotmc-public</id>
+ <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+ </repository>
+ </pluginRepository>
+ </pluginRepositories>

<repositories>
<repository>
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
+ <repository>
+ <id>sonatype</id>
+ <url>https://oss.sonatype.org/content/groups/public/</url>
+ </repository>
+ </repositories>
+
</repositories>

- <pluginRepositories>
- <pluginRepository>
- <id>spigotmc-public</id>
- <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
- </pluginRepository>
- </pluginRepositories>
-
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
@@ -56,6 +67,13 @@
@@ -56,6 +56,13 @@
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
Expand All @@ -97,7 +92,7 @@ index 7c81917d..4c5bda27 100644
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -100,15 +118,12 @@
@@ -100,15 +107,12 @@
</dependencies>

<build>
Expand All @@ -114,15 +109,15 @@ index 7c81917d..4c5bda27 100644
<dependencies>
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
@@ -131,6 +146,7 @@
@@ -131,6 +135,7 @@
</execution>
</executions>
<configuration>
+ <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<!-- when downloading via Maven we can pull depends individually -->
<shadedArtifactAttached>true</shadedArtifactAttached>
</configuration>
@@ -138,33 +154,4 @@
@@ -138,33 +143,4 @@
</plugins>
</build>

Expand Down Expand Up @@ -157,5 +152,5 @@ index 7c81917d..4c5bda27 100644
- </profiles>
</project>
--
2.18.0
2.19.0

Loading