Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: robske110/BanWarn
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.1.0
Choose a base ref
...
head repository: robske110/BanWarn
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 917 additions and 511 deletions.
  1. +9 −0 .poggit.yml
  2. +41 −0 .travis.yml
  3. +19 −11 English/plugin.yml
  4. +376 −242 English/src/robske_110/BanWarn/Main.php
  5. +16 −8 German/plugin.yml
  6. +377 −242 German/src/robske_110/BanWarn/Main.php
  7. +36 −7 README.md
  8. 0 Releases/1.0.X/{WarnBan_v1.0.2 → WarnBan_v1.0.2.txt}
  9. BIN Releases/1.1.X/{ALPHAS:BETAS → ALPHAS-BETAS}/BanWarn_v1.1.0-InDev-alpha3.phar
  10. BIN Releases/1.1.X/{ALPHAS:BETAS → ALPHAS-BETAS}/BanWarn_v1.1.0-InDev-alpha6.phar
  11. BIN Releases/1.1.X/{ALPHAS:BETAS → ALPHAS-BETAS}/BanWarn_v1.1.0-InDev-alpha9.phar
  12. BIN Releases/1.2.X/ALPHAS-BETAS/BanWarn_v1.2.0-InDev-alpha5.phar
  13. BIN Releases/1.2.X/ALPHAS-BETAS/BanWarn_v1.2.0-InDev-alpha7.phar
  14. BIN Releases/1.2.X/ALPHAS-BETAS/BanWarn_v1.2.0-InDev-beta1_deu.phar
  15. BIN Releases/1.2.X/ALPHAS-BETAS/BanWarn_v1.2.0-InDev-beta1_eng.phar
  16. BIN Releases/1.2.X/ALPHAS-BETAS/BanWarn_v1.2.0-InDev-beta2_deu.phar
  17. BIN Releases/1.2.X/ALPHAS-BETAS/BanWarn_v1.2.0-InDev-beta2_eng.phar
  18. BIN Releases/1.2.X/ALPHAS-BETAS/BanWarn_v1.2.0-InDev-beta2_pre1_deu.phar
  19. BIN Releases/1.2.X/ALPHAS-BETAS/BanWarn_v1.2.0-InDev-beta2_pre1_eng.phar
  20. BIN Releases/1.2.X/BanWarn_v1.2.0_deu.phar
  21. BIN Releases/1.2.X/BanWarn_v1.2.0_eng.phar
  22. BIN Releases/1.2.X/BanWarn_v1.2.1_deu.phar
  23. BIN Releases/1.2.X/BanWarn_v1.2.1_eng.phar
  24. BIN Releases/1.2.X/BanWarn_v1.2.2_deu.phar
  25. BIN Releases/1.2.X/BanWarn_v1.2.2_eng.phar
  26. BIN Releases/1.2.X/BanWarn_v1.2.3_deu.phar
  27. BIN Releases/1.2.X/BanWarn_v1.2.3_eng.phar
  28. +17 −1 Releases/Information.md
  29. +26 −0 Travis.php
9 changes: 9 additions & 0 deletions .poggit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
--- # https://poggit.pmmp.io/ci/robske110/BanWarn
branches:
- master
projects:
lang-English:
path: English/
lang-German:
path: German/
...
41 changes: 41 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#Travis CI

language: php

dist: trusty
sudo: false

php:
- 7.2

branches:
- master
- 2.0.0

before_script:
#- pecl install channel://pecl.php.net/pthreads-3.1.6
- git clone https://github.com/krakjoe/pthreads.git --depth=1
- cd pthreads
- phpize
- ./configure
- make
- make install
- cd ..
- echo "extension=pthreads.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo | pecl install channel://pecl.php.net/yaml-2.0.2
- git clone --recursive --branch release/3.1 https://github.com/pmmp/PocketMine-MP.git --depth=1
- cd PocketMine-MP
- composer install
- mkdir plugins
- cd plugins
- wget -O DevTools.phar https://jenkins.pmmp.io/job/PocketMine-MP/Alpha/artifact/DevTools.phar
- cd /home/travis/build/robske110/BanWarn/
- cp -rf Travis.php PocketMine-MP/
- cp -rf English/ PocketMine-MP/plugins/
- cd PocketMine-MP

script:
- php Travis.php

notifications:
email: false
30 changes: 19 additions & 11 deletions English/plugin.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,34 @@
name: BanWarn
api: [1.13.0, 2.0.0]
version: 1.1.0
api: [3.0.0]
version: 1.2.3
load: POSTWORLD
main: robske_110\BanWarn\Main
author: robske_110
website: https://github.com/robske110/BanWarn

commands:
warn:
description: Warns an player
description: Warns a player
usage: "/warn <PlayerName> <Reason> [Points]"
permission: ServerCore.command.warn
permission: BanWarn.command.warn
warninfo:
description: Outputs info about the warnings an player has
description: Outputs info about the warnings a player has
usage: "/warninfo <PlayerName>"
permission: ServerCore.command.warninfo
aliases: [wi]
permission: BanWarn.command.warninfo
aliases: [wi, warni, winfo]
warnpardon:
description: Wipes all warns of a player or removes single warns
usage: "/warnpardon <PlayerName>"
permission: BanWarn.command.warnpardon
aliases: [warnp, wpardon]

permissions:
ServerCore.command.warn:
description: "Allows the user to run the /warn command"
BanWarn.command.warn:
description: "Allows to run the /warn command"
default: op
ServerCore.command.warninfo:
description: "Allows the user to run the /warninfo command"
BanWarn.command.warninfo:
description: "Allows to run the /warninfo command"
default: op
BanWarn.command.warnpardon:
description: "Allows to run the /warninfo command"
default: op
Loading