Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-21 00:17:56 +01:00
Code Issues Projects Releases Wiki Activity
2,016 Commits 46 Branches 15 Tags 283 MiB
78202f87b7
Commit Graph

2016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aikar
e091466f34 Allow command line arg to allow normal reload 2016-03-21 21:56:52 -04:00
Aikar
646b62a220 Make /reload require typing confirm to actually reload 2016-03-21 21:40:29 -04:00
Aikar
1d83dde411 Fix rebuild patches for real this time. 2016-03-21 21:40:18 -04:00
Daniel Ennis
644e6827c4 Merge pull request #122 from willies952002/master 
Add Bukkit#reloadPermissions()
 2016-03-21 21:32:06 -04:00
willies952002
62580304f4 Add Bukkit#reloadPermissions() 
Fix issues with Paper build #544
 2016-03-21 21:29:41 -04:00
Aikar
def021fb9b fix rebuild patches and rebuild current patches 2016-03-21 20:46:54 -04:00
Daniel Ennis
8616dc012c Merge pull request #91 from willies952002/feature/permReload 
Allow Reloading of Custom Permissions - resolves #49
 2016-03-21 20:24:27 -04:00
William
869ab5202e Allow Reloading of Custom Permissions 
Add the ability to reload the custom permissions file by doing "/reload permissions"

Implements Feature Request: https://github.com/PaperMC/Paper/issues/49
 2016-03-21 19:28:52 -04:00
Zach Brown
48c7674933 Update upstream Spigot and upstreamMerge script 
Also remove paperclip from upstream merge, it shouldn't need merging very often
 2016-03-21 12:32:05 -05:00
Techcable
667953bb9f Make Spigot its own submodule 
Merge pull request #118 from Techcable/spigot-in-submodule
 2016-03-21 12:26:40 -05:00
Zach Brown
ca7c627ded Use singleton in Village class to work around null issue that evades 2016-03-21 10:28:45 -05:00
Zach Brown
836ec9dc1a Upstream merge Bukkit, update Paperclip 2016-03-21 09:04:19 -05:00
Zach Brown
e2bbf2228d Support offline mode from the whitelist command 
Closes GH-79
 2016-03-21 00:53:32 -05:00
Zach Brown
ef3a9f1286 Also handle original end case that spawned the issue 
Final commit for GH-96 if there's any justine in the world
 2016-03-20 23:15:37 -05:00
Zach
082e07406f Merge pull request #118 from Techcable/fix/spigot-title-compatibility 
Fix backwards compatibility with spigot title api
 2016-03-20 22:53:57 -05:00
Techcable
a96fcc9206 Fix backwards compatibility with spigot title api 
I shouldn't have assumed their api was anything other but a thin (and incomplete) wrapper over the packets.

Fixes #94
 2016-03-20 20:46:31 -07:00
Zach
09fd5a5505 Merge pull request #117 from willies952002/correct/README 
Update README.md
 2016-03-20 22:40:41 -05:00
Zach Brown
84b54438c1 Only mark player as invulnerable if they're actually changing worlds 
Fixes GH-96
 2016-03-20 22:39:00 -05:00
willies952002
d281b8fbc6 Update README.md 
Remove all reamining instances of `PaperSpigot` and replace them with `Paper`
 2016-03-20 21:00:46 -04:00
Zach Brown
537c4994db Only mark player as invulnerable if they're going to the end 
cc GH-96
 2016-03-20 19:44:49 -05:00
Zach Brown
f01982bf4c Upstream merge 2016-03-20 16:05:42 -05:00
Daniel Ennis
aa054b6838 Catch Async PlayerChunkMap operations - Fixes #113 2016-03-20 15:25:30 -04:00
Aikar
a1651ffd8e Disable Chunk Unload Queue Patch for now 2016-03-20 00:54:23 -04:00
Aikar
532e229c28 handle NaN health/absorb values and repair bad data 
Undoes damage from Damage API bugs
 2016-03-20 00:35:02 -04:00
Aikar
480a87933a Improve chunk unload queue to maintain some previous expectations 
While the previous logic was logically correct, some CB API's before
would request a chunk without removing it from the unload queue.

While this is logically wrong, some plugins seem to be causing unload issues.

This change will make anything using that one API that use to not remove from
queue, no longer remove from queue.

Hopefully other activities on the server will touch the chunk if it REALLY is in use.
 2016-03-20 00:13:20 -04:00
Zach Brown
3acf9df3be Merge latest upstream CB 2016-03-19 21:44:44 -05:00
md_5
ea7353c788 Rebuild patches. 2016-03-19 20:21:54 -05:00
Zach Brown
6760f394ef Update upstream and rebuild patches 2016-03-19 20:20:25 -05:00
Zach Brown
924ce8be30 Remove patch pulled upstream and rebuild patches 2016-03-19 17:52:09 -05:00
Aikar
a308ede0bb Optimize Navigation Listener 
Replace WeakHashMap with an ArrayList and manually manage object
lifecycle. Gives superior iteration performance at a slight cost
to removal performance and also ensures entities are removed immediately
upon losing their validity within the world.

Additionally, change listener registration to be done upon world add
instead of immediate up creation. This provides benefit of only
registering and ticking real Navigation objects, and not invalid
entities (cancelled entity spawns for example).
 2016-03-19 17:49:22 -05:00
Zach Brown
9d4a2cf8b3 Patch rebuild 2016-03-19 17:36:53 -05:00
kashike
918e177370 Set health before death event 2016-03-19 17:31:55 -05:00
kashike
3b15da52db Custom replacement for eaten items 2016-03-19 17:31:06 -05:00
Aikar
ea051e14d1 Fixes #95 - Vanilla bug with Villages 2016-03-19 15:21:39 -04:00
Zach
57aa8b7451 Merge pull request #101 from DemonWav/master 
Revert Spigot changes to blocking damage code
/me glances at imports
/me will fix later
 2016-03-19 12:25:22 -05:00
DemonWav
ba0da2d2dd Revert Spigot changes to blocking code, fix issue where entities cannot die 2016-03-19 12:20:27 -05:00
Aikar
c331e8978a Fix chunk unload issues - Resolves #97 2016-03-19 11:29:46 -04:00
Aikar
027eb66188 forgot to rebuild after last light change, another fix 2016-03-19 10:57:22 -04:00
Aikar
afd40e5d12 fix light level check on monsters 2016-03-19 10:45:28 -04:00
Aikar
e8649166ae always clean patches 2016-03-19 00:11:14 -04:00
Zach Brown
7455e115d0 Update upstreams & paperclip 
Should close GH-86
 2016-03-18 23:04:35 -05:00
md_5
f368e2543d Rebuild patches 2016-03-18 23:00:50 -05:00
Aikar
7c7f8b83ab Optimized Light Level Comparisons 
Use an optimized method to test if a block position meets a desired light level.

This method benefits from returning as soon as the desired light level matches.

Also Optimize Grass more
 2016-03-18 23:55:31 -04:00
Zach Brown
148f3809ca Re-add comment to navigation patch 2016-03-18 21:41:50 -05:00
Zach Brown
c19e52a63f Update upstream and rebuild patches 2016-03-18 21:37:58 -05:00
md_5
de235263df SPIGOT-1964: Remove 1.9.1 patch 2016-03-18 21:35:37 -05:00
Zach Brown
c909c3b884 Fix furnace cook time bug 2016-03-18 21:32:31 -05:00
Zach Brown
fa8f621d56 Make spawner nerfed mobs float AI toggleable 
closes GH-57
 2016-03-18 21:10:20 -05:00
Zach Brown
52f462d52d Force potion effect application in BeaconEffectEvent 2016-03-18 20:45:22 -05:00
Aikar
c51bf9d9f3 Optimize BlockStateList/BlockData 
Mojang included some sanity checks on arguments passed to the BlockData.
This code results in the Hash look up occuring twice per call, one to test if it exists
and another to retrieve the result.

This code should ideally never be hit, unless mojang released a bad build. We can discover bugs with this as furthur code that never expects a null
would then NPE, so it would not result in hidden issues.

This is super hot code, so removing those checks should give decent gains.
 2016-03-18 19:25:43 -04:00